diff options
author | José Valim <jose.valim@gmail.com> | 2011-09-15 13:22:05 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-09-15 13:22:05 -0700 |
commit | 8a32a58f6f95deeae1ffe6f5dba9c4d71fbc8dff (patch) | |
tree | 9ac563affb6d71dc06943ddf296462afe41761d3 /activesupport/test/message_encryptor_test.rb | |
parent | 28300f4ea86642eba5d60f5a64b9ea221f794031 (diff) | |
parent | 6d520803ee005d47c876662ba426083e823199ed (diff) | |
download | rails-8a32a58f6f95deeae1ffe6f5dba9c4d71fbc8dff.tar.gz rails-8a32a58f6f95deeae1ffe6f5dba9c4d71fbc8dff.tar.bz2 rails-8a32a58f6f95deeae1ffe6f5dba9c4d71fbc8dff.zip |
Merge pull request #3037 from wvanbergen/master
MessageVerifier: set serializer and crypto algorithm using an option hash
Diffstat (limited to 'activesupport/test/message_encryptor_test.rb')
-rw-r--r-- | activesupport/test/message_encryptor_test.rb | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/activesupport/test/message_encryptor_test.rb b/activesupport/test/message_encryptor_test.rb index 9c89512b42..83a19f8106 100644 --- a/activesupport/test/message_encryptor_test.rb +++ b/activesupport/test/message_encryptor_test.rb @@ -10,7 +10,7 @@ else require 'active_support/time' require 'active_support/json' -class MessageEncryptorTest < Test::Unit::TestCase +class MessageEncryptorTest < ActiveSupport::TestCase class JSONSerializer def dump(value) @@ -52,11 +52,17 @@ class MessageEncryptorTest < Test::Unit::TestCase end def test_alternative_serialization_method - @encryptor.serializer = JSONSerializer.new - message = @encryptor.encrypt_and_sign({ :foo => 123, 'bar' => Time.utc(2010) }) - assert_equal @encryptor.decrypt_and_verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00Z" } + encryptor = ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64), :serializer => JSONSerializer.new) + message = encryptor.encrypt_and_sign({ :foo => 123, 'bar' => Time.utc(2010) }) + assert_equal encryptor.decrypt_and_verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00Z" } end + def test_digest_algorithm_as_second_parameter_deprecation + assert_deprecated(/options hash/) do + ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64), 'aes-256-cbc') + end + end + private def assert_not_decrypted(value) assert_raise(ActiveSupport::MessageEncryptor::InvalidMessage) do |