aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-24 22:39:11 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-24 22:39:11 -0800
commitce50ca1baf29f2edc829011ffc247e68ebd995c3 (patch)
tree70e6a7530ee146277b9dec666849eeb817e28522
parentcb4968171020bf3bb8f713cd69fe035ee5a3d608 (diff)
downloadrails-ce50ca1baf29f2edc829011ffc247e68ebd995c3.tar.gz
rails-ce50ca1baf29f2edc829011ffc247e68ebd995c3.tar.bz2
rails-ce50ca1baf29f2edc829011ffc247e68ebd995c3.zip
Explicitly require AS::Deprecation for the SecretKeyGenerator. Bring in ActiveSupport::TestCase for its tests.
-rw-r--r--railties/lib/rails_generator/secret_key_generator.rb2
-rw-r--r--railties/test/secret_key_generation_test.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails_generator/secret_key_generator.rb b/railties/lib/rails_generator/secret_key_generator.rb
index 553811d35d..7dd495a2f5 100644
--- a/railties/lib/rails_generator/secret_key_generator.rb
+++ b/railties/lib/rails_generator/secret_key_generator.rb
@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
module Rails
# A class for creating random secret keys. This class will do its best to create a
# random secret key that's as secure as possible, using whatever methods are
diff --git a/railties/test/secret_key_generation_test.rb b/railties/test/secret_key_generation_test.rb
index df486c3bbb..2c7c3d5dfe 100644
--- a/railties/test/secret_key_generation_test.rb
+++ b/railties/test/secret_key_generation_test.rb
@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'abstract_unit'
# Must set before requiring generator libs.
if defined?(RAILS_ROOT)