Merge pull request rails#19685 from vngrs/actionview_parent_layout_bug

fix for actionview parent layout bug

Author: rafaelfranca

actionview/lib/action_view/layouts.rb

@@ -315,16 +315,25 @@ def _write_layout_method # :nodoc:
             name_clause
         end
 
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def _layout
-            if _conditional_layout?
+        if self._layout_conditions.empty?
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def _layout
               #{layout_definition}
-            else
-              #{name_clause}
             end
-          end
-          private :_layout
-        RUBY
+            private :_layout
+          RUBY
+        else
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def _layout
+              if _conditional_layout?
+                #{layout_definition}
+              else
+                #{name_clause}
+              end
+            end
+            private :_layout
+          RUBY
+        end
       end
 
       private

actionview/test/actionpack/controller/layout_test.rb

@@ -122,6 +122,14 @@ def hello
   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 @@ def test_absolute_pathed_layout
     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