Merge pull request #7574 from NickLaMuro/rails-6-use-relative-paths-f…

…or-layouts [rails6] Use relative paths for layouts
ManageIQ · Jan 26, 2021 · 95e1857 · 95e1857
2 parents f2535fa + d2f1b4f
commit 95e1857
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/controllers/application_controller/report_downloads.rb b/app/controllers/application_controller/report_downloads.rb
@@ -45,8 +45,8 @@ def render_pdf_internal(report)
   def render_pdf_internal_rr(report, result)
     @options = report_print_options(report, result) # used by the layouts/print
     render(
-      :template => '/layouts/print/report',
-      :layout   => '/layouts/print',
+      :template => 'layouts/print/report',
+      :layout   => 'layouts/print',
       :locals   => {
         :report => report,
         :data   => result.html_rows.join
@@ -122,8 +122,8 @@ def print_report
 
     @options = report_print_options(result.report, result) # used by the layouts/print
     render(
-      :template => '/layouts/print/report',
-      :layout   => '/layouts/print',
+      :template => 'layouts/print/report',
+      :layout   => 'layouts/print',
       :locals   => {
         :report => result.report,
         :data   => result.html_rows.join
@@ -231,7 +231,7 @@ def set_summary_pdf_data
       end
 
       disable_client_cache
-      render :template => '/layouts/print/textual_summary', :layout => '/layouts/print'
+      render :template => 'layouts/print/textual_summary', :layout => 'layouts/print'
     end
   end
 end
diff --git a/spec/controllers/application_controller/compare_spec.rb b/spec/controllers/application_controller/compare_spec.rb
@@ -87,8 +87,8 @@
 
       expect(controller).to receive(:render).with(
         hash_including(
-          :template => '/layouts/print/report',
-          :layout   => '/layouts/print',
+          :template => 'layouts/print/report',
+          :layout   => 'layouts/print',
           :locals   => hash_including(
             :report # the report does not match due to a ".dup" call in the controller.
           )

diff --git a/spec/controllers/application_controller/report_downloads_spec.rb b/spec/controllers/application_controller/report_downloads_spec.rb
@@ -12,7 +12,7 @@
       end
 
       it "returns with print" do
-        expect(controller).to receive(:render).with(:layout => '/layouts/print', :template => '/layouts/print/textual_summary')
+        expect(controller).to receive(:render).with(:layout => 'layouts/print', :template => 'layouts/print/textual_summary')
         controller.send(:set_summary_pdf_data)
       end
     end