diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-04-02 17:02:02 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-04-02 17:02:02 -0700 |
| commit | ac6fc606213f591f8e2c249b144843354c69af3c (patch) | |
| tree | fe5249768ce475e0f19ae7213fa51b09d76f1989 /actionpack/test/controller/flash_test.rb | |
| parent | e130e96f8be3f56d5e8878b6a05259f70d9292b7 (diff) | |
| parent | 7c7a42734406c4f1d402d32ff0b1b916545d0da0 (diff) | |
| download | rails-ac6fc606213f591f8e2c249b144843354c69af3c.tar.gz rails-ac6fc606213f591f8e2c249b144843354c69af3c.tar.bz2 rails-ac6fc606213f591f8e2c249b144843354c69af3c.zip | |
Merge pull request #10061 from trevorturk/dummy-key-generator-rename
Rename DummyKeyGenerator -> LegacyKeyGenerator
Diffstat (limited to 'actionpack/test/controller/flash_test.rb')
| -rw-r--r-- | actionpack/test/controller/flash_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb index 9d4356f546..e4d0eb88db 100644 --- a/actionpack/test/controller/flash_test.rb +++ b/actionpack/test/controller/flash_test.rb @@ -1,5 +1,5 @@ require 'abstract_unit' -# FIXME remove DummyKeyGenerator and this require in 4.1 +# FIXME remove LegacyKeyGenerator and this require in 4.1 require 'active_support/key_generator' class FlashTest < ActionController::TestCase @@ -219,7 +219,7 @@ end class FlashIntegrationTest < ActionDispatch::IntegrationTest SessionKey = '_myapp_session' - Generator = ActiveSupport::DummyKeyGenerator.new('b3c631c314c0bbca50c1b2843150fe33') + Generator = ActiveSupport::LegacyKeyGenerator.new('b3c631c314c0bbca50c1b2843150fe33') class TestController < ActionController::Base add_flash_types :bar |