diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-02 20:57:54 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-02 20:57:54 -0300 |
| commit | 8193a09a1f0f15c4b7624d6c24e8a779baa64d39 (patch) | |
| tree | 9271e48a2104a882e5e3971dd935c266b23f0779 /actionview/test | |
| parent | 4519727cdb4a2e55aceefcc41f16b2c1da0d1681 (diff) | |
| download | rails-8193a09a1f0f15c4b7624d6c24e8a779baa64d39.tar.gz rails-8193a09a1f0f15c4b7624d6c24e8a779baa64d39.tar.bz2 rails-8193a09a1f0f15c4b7624d6c24e8a779baa64d39.zip | |
Revert "Merge pull request #19685 from vngrs/actionview_parent_layout_bug"
This reverts commit a9d58c77da800bb0052c9bfa432828b02526022c, reversing
changes made to 041c2c879a3c4086ad3aa6d30fed1eede1d53c11.
Reason: The old behavior is how it was working in previous version of
Rails since 4.0.x so it is not safe to backport to a stable branch.
See https://github.com/rails/rails/issues/19626#issuecomment-89862258
and https://github.com/rails/rails/pull/15050#issuecomment-45333449
Diffstat (limited to 'actionview/test')
| -rw-r--r-- | actionview/test/actionpack/controller/layout_test.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/actionview/test/actionpack/controller/layout_test.rb b/actionview/test/actionpack/controller/layout_test.rb index 452634a3b7..64bc4c41d6 100644 --- a/actionview/test/actionpack/controller/layout_test.rb +++ b/actionview/test/actionpack/controller/layout_test.rb @@ -122,14 +122,6 @@ 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 @@ -233,12 +225,6 @@ 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_includes @response.body, 'item.erb' - end end class SetsNonExistentLayoutFile < LayoutTest |