Merge pull request #19685 from vngrs/actionview_parent_layout_bug

fix for actionview parent layout bug

1 files changed, 14 insertions, 0 deletions

diff --git a/actionview/test/actionpack/controller/layout_test.rb b/actionview/test/actionpack/controller/layout_test.rb
index 7b8a83e2fe..64ab125637 100644
--- a/actionview/test/actionpack/controller/layout_test.rb
+++ b/actionview/test/actionpack/controller/layout_test.rb
@@ -122,6 +122,14 @@ class PrependsViewPathController < LayoutTest
   end
 end
 
+class ParentController < LayoutTest
+  layout 'item'
+end
+
+class ChildController < ParentController
+  layout 'layout_test', only: :hello
+end
+
 class OnlyLayoutController < LayoutTest
   layout 'item', :only => "hello"
 end
@@ -225,6 +233,12 @@ class LayoutSetInResponseTest < ActionController::TestCase
     get :hello
     assert_equal "layout_test.erb hello.erb", @response.body.strip
   end
+
+  def test_respect_to_parent_layout
+    @controller = ChildController.new
+    get :goodbye
+    assert_template :layout => "layouts/item"
+  end
 end
 
 class SetsNonExistentLayoutFile < LayoutTest