From d411c85a65baaf4ed268b1b1bb4df408cee4981a Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Mon, 23 May 2011 12:02:06 +0100 Subject: Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required. --- activesupport/test/message_encryptor_test.rb | 2 +- activesupport/test/notifications_test.rb | 2 +- activesupport/test/secure_random_test.rb | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'activesupport/test') 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 -- cgit v1.2.3