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 /railties/test | |
| 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 'railties/test')
| -rw-r--r-- | railties/test/application/middleware/remote_ip_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb index f0d3438aa4..c655384d75 100644 --- a/railties/test/application/middleware/remote_ip_test.rb +++ b/railties/test/application/middleware/remote_ip_test.rb @@ -1,5 +1,5 @@ require 'isolation/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' module ApplicationTests @@ -10,7 +10,7 @@ module ApplicationTests remote_ip = nil env = Rack::MockRequest.env_for("/").merge(env).merge!( 'action_dispatch.show_exceptions' => false, - 'action_dispatch.key_generator' => ActiveSupport::DummyKeyGenerator.new('b3c631c314c0bbca50c1b2843150fe33') + 'action_dispatch.key_generator' => ActiveSupport::LegacyKeyGenerator.new('b3c631c314c0bbca50c1b2843150fe33') ) endpoint = Proc.new do |e| |