Merge pull request #9215 from jrafanie/rails7_compatible_changes

Rails 7 compatible changes (part 1)

Author: GilbertCherrie

app/controllers/ops_controller/settings/common.rb

@@ -182,7 +182,11 @@ def pglogical_save_subscriptions
       task_opts = {:action => "Save subscriptions for global region", :userid => session[:userid]}
       queue_opts = {:class_name => "MiqPglogical", :method_name => "save_global_region",
                     :args       => [subscriptions_to_save, subsciptions_to_remove]}
-      ActiveRecord::Base.yaml_column_permitted_classes |= [subscriptions_to_save.first.class, subsciptions_to_remove.first.class]
+      if ActiveRecord.respond_to?(:yaml_column_permitted_classes)
+        ActiveRecord.yaml_column_permitted_classes       = YamlPermittedClasses.app_yaml_permitted_classes | [subscriptions_to_save.first.class, subsciptions_to_remove.first.class]
+      else
+        ActiveRecord::Base.yaml_column_permitted_classes = YamlPermittedClasses.app_yaml_permitted_classes | [subscriptions_to_save.first.class, subsciptions_to_remove.first.class]
+      end
     when "remote"
       task_opts  = {:action => "Configure the database to be a replication remote region",
                     :userid => session[:userid]}

spec/views/availability_zone/show.html.haml_spec.rb

@@ -1,15 +1,16 @@
 describe "availability_zone/show.html.haml" do
   shared_examples_for "miq_before_onload JS is needed" do
     it "renders proper JS" do
-      js_string = "ManageIQ.afterOnload = {action: () => miqAsyncAjax(\"/availability_zone/#{action}/#{availability_zone.id}\")}"
+      template_path = "availability_zone/#{action}"
+      js_string = "ManageIQ.afterOnload = {action: () => miqAsyncAjax(\"/#{template_path}/#{availability_zone.id}\")}"
 
-      render
+      render :template => template_path
       expect(rendered).to include(js_string)
     end
   end
 
   let(:availability_zone) { double("AvailabilityZone", :name => 'My AZ', :id => 1) }
-  let(:action) { 'index' }
+  let(:action) { 'show' }
 
   before do
     assign(:record, availability_zone)

spec/views/catalog/_form.html.haml_spec.rb

@@ -17,7 +17,7 @@
   end
 
   it "Renders form when adding catalog bundle and st_prov_type is not set" do
-    render
+    render :template => "catalog/_form"
     expect(response).to render_template(:partial => "catalog/_form_basic_info")
   end
 end

spec/views/catalog/_sandt_tree_show.html.haml_spec.rb

@@ -13,7 +13,7 @@
   end
 
   it "Renders bundle summary screen" do
-    render
+    render :template => "catalog/_sandt_tree_show"
     expect(rendered).to include(bundle.name)
     expect(rendered).to include(bundle.tenant.name)
   end

spec/views/dashboard/login.html.haml_spec.rb

@@ -8,15 +8,15 @@
     end
 
     it "when authentication is 'database'" do
-      render
+      render :template => "dashboard/login"
       expect(response).to have_selector("form#login_div:has(input#browser_name)")
       expect(response).to have_selector("form#login_div:has(input#browser_version)")
       expect(response).to have_selector("form#login_div:has(input#browser_os)")
       expect(response).to have_selector("form#login_div:has(input#user_TZO)")
     end
 
     it "when authentication is not 'database'" do
-      render
+      render :template => "dashboard/login"
       expect(response).to have_selector("form#login_div:has(input#browser_name)")
       expect(response).to have_selector("form#login_div:has(input#browser_version)")
       expect(response).to have_selector("form#login_div:has(input#browser_os)")
@@ -33,15 +33,15 @@
 
     it "show" do
       stub_settings(:server => {}, :session => {:show_login_info => true}, :authentication => {})
-      render
+      render :template => "dashboard/login"
       labels.each do |label|
         expect(response).to have_selector('p', :text => label)
       end
     end
 
     it "hide" do
       stub_settings(:server => {}, :session => {:show_login_info => false}, :authentication => {})
-      render
+      render :template => "dashboard/login"
       labels.each do |label|
         expect(response).not_to have_selector('p', :text => label)
       end

spec/views/ems_cluster/show.html.haml_spec.rb

@@ -15,7 +15,7 @@
     let(:showtype) { 'drift' }
 
     it 'should render the compare partial' do
-      render
+      render :template => "ems_cluster/show"
       expect(response).to render_template(:partial => 'layouts/_compare')
     end
   end

spec/views/host/_show.html.haml_spec.rb

@@ -5,7 +5,7 @@
   shared_examples_for "miq_before_onload JS is needed" do
     it "renders proper JS" do
       js_string = "ManageIQ.afterOnload = {action: () => miqAsyncAjax(\"/host/#{action}/#{host.id}\")}"
-      render
+      render :template => "host/show"
       expect(rendered).to include(js_string)
     end
   end
@@ -46,7 +46,7 @@
     it "should render gtl view" do
       assign(:lastaction, "host_services")
       assign(:view, OpenStruct.new(:table => OpenStruct.new(:data => [])))
-      render
+      render :template => "host/show"
       expect(view).to render_template(:partial => 'layouts/gtl', :locals => {:action_url => 'host_services'})
     end
   end

spec/views/layouts/_center_div_no_listnav.html.haml_spec.rb

@@ -11,7 +11,7 @@
   end
 
   it 'renders Search bar' do
-    render
+    render :template => "layouts/_center_div_no_listnav"
     expect(rendered).to include('SearchBar')
   end
 end

spec/views/layouts/_item.html.haml_spec.rb

@@ -5,7 +5,7 @@
     assign(:view, FactoryBot.create(:miq_report_filesystem))
     assign(:item, fs)
     assign(:lastaction, 'filesystems')
-    render
+    render :template => "layouts/_item"
 
     expect(response).to have_selector('label', :text => 'Name')
     expect(response).to have_selector('label', :text => 'File Name')

spec/views/layouts/_searchbar.html.haml_spec.rb

@@ -5,14 +5,14 @@
   end
 
   it 'renders Search bar and not quick search' do
-    render
+    render :template => "layouts/_searchbar"
     expect(rendered).to include('SearchBar')
     expect(rendered).not_to include('quicksearchbox')
   end
 
   it 'renders Advanced Search and quick search' do
     allow(view).to receive(:display_adv_search?).and_return(true)
-    render
+    render :template => "layouts/_searchbar"
     expect(rendered).to include('quicksearchbox')
   end
 end