diff options
| author | Michael Koziarski <michael@koziarski.com> | 2012-10-02 14:26:16 -0700 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2012-10-02 14:26:16 -0700 |
| commit | 0a507925cfc54246dc7d329936f60f8f410c38b6 (patch) | |
| tree | f97e4a6a7c36cdd5af7b82330b9414bd94cb6991 /railties/test | |
| parent | df08271f9c044b7614d70baf4b818f1a79f4a6e1 (diff) | |
| parent | 0479bff32dfb26a420b9ab4e2c2e6c2ed17550a3 (diff) | |
| download | rails-0a507925cfc54246dc7d329936f60f8f410c38b6.tar.gz rails-0a507925cfc54246dc7d329936f60f8f410c38b6.tar.bz2 rails-0a507925cfc54246dc7d329936f60f8f410c38b6.zip | |
Merge pull request #6952 from NZKoz/key_generator
Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/configuration_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index d014e5e362..d8d022c265 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -634,6 +634,7 @@ module ApplicationTests assert_equal app.env_config['action_dispatch.show_exceptions'], app.config.action_dispatch.show_exceptions assert_equal app.env_config['action_dispatch.logger'], Rails.logger assert_equal app.env_config['action_dispatch.backtrace_cleaner'], Rails.backtrace_cleaner + assert_equal app.env_config['action_dispatch.key_generator'], Rails.application.key_generator end test "config.colorize_logging default is true" do |