diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-09-03 17:44:58 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-09-03 17:44:58 +0100 |
| commit | 2933f4481f8b70b3b809fab6e818d80c2af1b919 (patch) | |
| tree | c83d1308545cc82215b90ab37208cc81b4712276 /railties/test | |
| parent | 36ee17d458b86c5f3f371810160e8839d318bbf1 (diff) | |
| parent | 10fe6a6d8940300dd6698ec38e9c9573404e687d (diff) | |
| download | rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.tar.gz rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.tar.bz2 rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/resources.rb
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/secret_key_generation_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/test/secret_key_generation_test.rb b/railties/test/secret_key_generation_test.rb index 2a04cff856..7269f98ce5 100644 --- a/railties/test/secret_key_generation_test.rb +++ b/railties/test/secret_key_generation_test.rb @@ -31,6 +31,8 @@ class SecretKeyGenerationTest < Test::Unit::TestCase end def test_secret_key_generation - assert @generator.generate_secret.length >= SECRET_KEY_MIN_LENGTH + assert_deprecated /ActiveSupport::SecureRandom\.hex\(64\)/ do + assert @generator.generate_secret.length >= SECRET_KEY_MIN_LENGTH + end end end |