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 | |
| 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
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | railties/test/application/middleware/session_test.rb | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 86328e0ef6..65644762a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ env: rvm: - 2.2.6 - 2.3.3 + - 2.4.0-rc1 - ruby-head matrix: diff --git a/Gemfile.lock b/Gemfile.lock index 3a616402f1..1c80ab19a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.2) + concurrent-ruby (1.0.3) connection_pool (2.2.0) cookiejar (0.3.3) curses (1.0.2) @@ -329,7 +329,7 @@ GEM serverengine (~> 1.5.11) thor thread (~> 0.1.7) - sprockets (3.7.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-export (0.9.1) 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"] |