aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-05-23 12:02:06 +0100
committerJon Leighton <j@jonathanleighton.com>2011-05-23 20:25:44 +0100
commitd411c85a65baaf4ed268b1b1bb4df408cee4981a (patch)
treeb054f3a4b95748b10e70c8d3a952e3b829366f2f /activesupport/test
parenta5fb1c61755f03a8c75b0a434fb2aca57502293b (diff)
downloadrails-d411c85a65baaf4ed268b1b1bb4df408cee4981a.tar.gz
rails-d411c85a65baaf4ed268b1b1bb4df408cee4981a.tar.bz2
rails-d411c85a65baaf4ed268b1b1bb4df408cee4981a.zip
Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required.
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/message_encryptor_test.rb2
-rw-r--r--activesupport/test/notifications_test.rb2
-rw-r--r--activesupport/test/secure_random_test.rb10
3 files changed, 7 insertions, 7 deletions
diff --git a/activesupport/test/message_encryptor_test.rb b/activesupport/test/message_encryptor_test.rb
index 419ac14283..e45d5ecd59 100644
--- a/activesupport/test/message_encryptor_test.rb
+++ b/activesupport/test/message_encryptor_test.rb
@@ -11,7 +11,7 @@ require 'active_support/time'
class MessageEncryptorTest < Test::Unit::TestCase
def setup
- @encryptor = ActiveSupport::MessageEncryptor.new(ActiveSupport::SecureRandom.hex(64))
+ @encryptor = ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64))
@data = { :some => "data", :now => Time.local(2010) }
end
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
index 7b48b3f85b..cc0dc564f7 100644
--- a/activesupport/test/notifications_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -215,7 +215,7 @@ module Notifications
protected
def random_id
- @random_id ||= ActiveSupport::SecureRandom.hex(10)
+ @random_id ||= SecureRandom.hex(10)
end
end
end
diff --git a/activesupport/test/secure_random_test.rb b/activesupport/test/secure_random_test.rb
index 44694cd811..799ac2a87b 100644
--- a/activesupport/test/secure_random_test.rb
+++ b/activesupport/test/secure_random_test.rb
@@ -2,18 +2,18 @@ require 'abstract_unit'
class SecureRandomTest < Test::Unit::TestCase
def test_random_bytes
- b1 = ActiveSupport::SecureRandom.random_bytes(64)
- b2 = ActiveSupport::SecureRandom.random_bytes(64)
+ b1 = SecureRandom.random_bytes(64)
+ b2 = SecureRandom.random_bytes(64)
assert_not_equal b1, b2
end
def test_hex
- b1 = ActiveSupport::SecureRandom.hex(64)
- b2 = ActiveSupport::SecureRandom.hex(64)
+ b1 = SecureRandom.hex(64)
+ b2 = SecureRandom.hex(64)
assert_not_equal b1, b2
end
def test_random_number
- assert ActiveSupport::SecureRandom.random_number(5000) < 5000
+ assert SecureRandom.random_number(5000) < 5000
end
end