aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-28 11:47:06 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-28 11:47:06 -0700
commitce4d13861dc54a1ac7fbe411327b9a2427f95366 (patch)
tree54863b03010dbbc4f729bc600b8e83f54e460c71 /railties
parent293f99700d6f2388ea5c504d706651ff3044d733 (diff)
parentacbf2b74aa3001fb6064bba96cd0033495774357 (diff)
downloadrails-ce4d13861dc54a1ac7fbe411327b9a2427f95366.tar.gz
rails-ce4d13861dc54a1ac7fbe411327b9a2427f95366.tar.bz2
rails-ce4d13861dc54a1ac7fbe411327b9a2427f95366.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties')
-rw-r--r--railties/test/secret_key_generation_test.rb4
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