diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-13 06:24:07 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-13 06:24:07 -0700 |
| commit | ca50043a7ad95825b3830d97294b14b665a7d698 (patch) | |
| tree | 2e663f4cd2ff552bf5202996a770f2b09efcfe46 /actionpack/test | |
| parent | 0729cc8ef840cf54dc424e6e3c2b50e8a23e22ed (diff) | |
| parent | 1413ee991ccfc76b24f29eb03c9cff82e588e5d7 (diff) | |
| download | rails-ca50043a7ad95825b3830d97294b14b665a7d698.tar.gz rails-ca50043a7ad95825b3830d97294b14b665a7d698.tar.bz2 rails-ca50043a7ad95825b3830d97294b14b665a7d698.zip | |
Merge pull request #12222 from rcillo/fix-custom-flash
Custom flash should be defined only for the class that defines it and it's subclasses
Fixes #12057
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/flash_test.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb index 3b874a739a..c64ffef654 100644 --- a/actionpack/test/controller/flash_test.rb +++ b/actionpack/test/controller/flash_test.rb @@ -214,6 +214,18 @@ class FlashTest < ActionController::TestCase get :redirect_with_foo_flash assert_equal "for great justice", @controller.send(:flash)[:foo] end + + class SubclassesTestController < TestController; end + + def test_add_flash_type_to_subclasses + TestController.add_flash_types :foo + assert SubclassesTestController._flash_types.include?(:foo) + end + + def test_do_not_add_flash_type_to_parent_class + SubclassesTestController.add_flash_types :bar + assert_not TestController._flash_types.include?(:bar) + end end class FlashIntegrationTest < ActionDispatch::IntegrationTest |