diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-12-20 21:35:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 21:35:18 +0100 |
| commit | 7a42df07ca1c6032fbdbd8ee6017e173564eb429 (patch) | |
| tree | 921b80168b307c18b116640d8e2ad54c9a2d3cd8 /railties | |
| parent | e592ee20a9d6889dcfbc05e485f448dfeda9b72f (diff) | |
| parent | 67be4402e5b53edeb70dc212560a7d6a00acb345 (diff) | |
| download | rails-7a42df07ca1c6032fbdbd8ee6017e173564eb429.tar.gz rails-7a42df07ca1c6032fbdbd8ee6017e173564eb429.tar.bz2 rails-7a42df07ca1c6032fbdbd8ee6017e173564eb429.zip | |
Merge pull request #27412 from maclover7/jm-ruby-24
Ruby 2.4 compatibility
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/middleware/session_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb index 0e4acfdcec..959a629ede 100644 --- a/railties/test/application/middleware/session_test.rb +++ b/railties/test/application/middleware/session_test.rb @@ -173,7 +173,7 @@ module ApplicationTests secret = app.key_generator.generate_key("encrypted cookie") sign_secret = app.key_generator.generate_key("signed encrypted cookie") - encryptor = ActiveSupport::MessageEncryptor.new(secret, sign_secret) + encryptor = ActiveSupport::MessageEncryptor.new(secret[0, ActiveSupport::MessageEncryptor.key_len], sign_secret) get "/foo/read_raw_cookie" assert_equal 1, encryptor.decrypt_and_verify(last_response.body)["foo"] @@ -222,7 +222,7 @@ module ApplicationTests secret = app.key_generator.generate_key("encrypted cookie") sign_secret = app.key_generator.generate_key("signed encrypted cookie") - encryptor = ActiveSupport::MessageEncryptor.new(secret, sign_secret) + encryptor = ActiveSupport::MessageEncryptor.new(secret[0, ActiveSupport::MessageEncryptor.key_len], sign_secret) get "/foo/read_raw_cookie" assert_equal 1, encryptor.decrypt_and_verify(last_response.body)["foo"] @@ -281,7 +281,7 @@ module ApplicationTests secret = app.key_generator.generate_key("encrypted cookie") sign_secret = app.key_generator.generate_key("signed encrypted cookie") - encryptor = ActiveSupport::MessageEncryptor.new(secret, sign_secret) + encryptor = ActiveSupport::MessageEncryptor.new(secret[0, ActiveSupport::MessageEncryptor.key_len], sign_secret) get "/foo/read_raw_cookie" assert_equal 2, encryptor.decrypt_and_verify(last_response.body)["foo"] |