Fixes #37848 - Support Rails 7.0

theforeman · Nov 4, 2024 · 7a10eeb · 7a10eeb
1 parent 0bd8029
commit 7a10eeb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/config/routes.rb b/config/routes.rb
@@ -8,13 +8,13 @@
           :apiv => /v2/,
           :constraints => ApiConstraints.new(version: 2, default: true) do
       constraints(:id => %r{[^\/]+}) do
-        resources :hosts, :only => [] do
+        resources :hosts, :except => [:new, :edit] do
           member do
             post :play_roles
             get :ansible_roles
             post :assign_ansible_roles
-            put 'ansible_roles/:ansible_role_id', :to => 'hosts#add_ansible_role', :constraints => { id: %r{[^\/]+} }
-            delete 'ansible_roles/:ansible_role_id', :to => 'hosts#remove_ansible_role', :constraints => { id: %r{[^\/]+} }
+            put 'ansible_roles/:ansible_role_id', :to => 'hosts#add_ansible_role'
+            delete 'ansible_roles/:ansible_role_id', :to => 'hosts#remove_ansible_role'
           end
           collection do
             post :multiple_play_roles
@@ -25,8 +25,8 @@
             post :play_roles
             get :ansible_roles
             post :assign_ansible_roles
-            put 'ansible_roles/:ansible_role_id', :to => 'hostgroups#add_ansible_role', :constraints => { id: %r{[^\/]+} }
-            delete 'ansible_roles/:ansible_role_id', :to => 'hostgroups#remove_ansible_role', :constraints => { id: %r{[^\/]+} }
+            put 'ansible_roles/:ansible_role_id', :to => 'hostgroups#add_ansible_role'
+            delete 'ansible_roles/:ansible_role_id', :to => 'hostgroups#remove_ansible_role'
           end
           collection do
             post :multiple_play_roles

diff --git a/test/test_plugin_helper.rb b/test/test_plugin_helper.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'test_helper'
-require 'facets'
 
 def ansible_fixture_file(filename)
   File.join(