diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-09-25 20:28:26 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2017-09-25 20:28:26 +0200 |
| commit | 1fa268bfa5667a0e9ddbfda243b5282c023ab9ad (patch) | |
| tree | dea9b1142f64c167fce2982e8891988ec2d492d3 /railties/test/application/middleware/session_test.rb | |
| parent | 9befc197f926272abbba5a1ca1323ce4f15ebd10 (diff) | |
| download | rails-1fa268bfa5667a0e9ddbfda243b5282c023ab9ad.tar.gz rails-1fa268bfa5667a0e9ddbfda243b5282c023ab9ad.tar.bz2 rails-1fa268bfa5667a0e9ddbfda243b5282c023ab9ad.zip | |
Fix cookies/session tests broken after merging key rotation.
Based on, yet closes https://github.com/rails/rails/pull/30708
Fix the session test by properly truncating the legacy encryption
key for cbc encryption. Borrowed straight from 👆.
Fix the cookies test a little differently than the PR. Basically
keep every config within the config block.
[ Michael Coyne & Kasper Timm Hansen ]
Diffstat (limited to 'railties/test/application/middleware/session_test.rb')
| -rw-r--r-- | railties/test/application/middleware/session_test.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb index 36d1bf5bf2..a17988235a 100644 --- a/railties/test/application/middleware/session_test.rb +++ b/railties/test/application/middleware/session_test.rb @@ -301,8 +301,6 @@ module ApplicationTests end test "session upgrading from AES-CBC-HMAC encryption to AES-GCM encryption" do - skip "@kaspth will fix this" - app_file "config/routes.rb", <<-RUBY Rails.application.routes.draw do get ':controller(/:action)' |