diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-01-12 07:20:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-12 07:20:28 +0000 |
| commit | 033f6540270ea84e7579a585c657ed2c3bcf0ee0 (patch) | |
| tree | fd58e999e3e198742b76a38f7b848eb0d7f4349e /actionpack/test/dispatch | |
| parent | 37f889b4a2d8862fb7c6939e5bd6be5897a587b1 (diff) | |
| parent | cb9d0e4864fa68fad9c49b880c32e90ddf0545bd (diff) | |
| download | rails-033f6540270ea84e7579a585c657ed2c3bcf0ee0.tar.gz rails-033f6540270ea84e7579a585c657ed2c3bcf0ee0.tar.bz2 rails-033f6540270ea84e7579a585c657ed2c3bcf0ee0.zip | |
Merge pull request #27610 from Envek/fix_and_speed_up_duration_parsing
Fix inconsistent parsing of Durations with both months and years
Diffstat (limited to 'actionpack/test/dispatch')
| -rw-r--r-- | actionpack/test/dispatch/ssl_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/ssl_test.rb b/actionpack/test/dispatch/ssl_test.rb index e29ffa750c..53b99ebbc4 100644 --- a/actionpack/test/dispatch/ssl_test.rb +++ b/actionpack/test/dispatch/ssl_test.rb @@ -130,7 +130,7 @@ class StrictTransportSecurityTest < SSLTest end test ":expires supports AS::Duration arguments" do - assert_hsts "max-age=31557600; includeSubDomains", hsts: { expires: 1.year } + assert_hsts "max-age=31556952; includeSubDomains", hsts: { expires: 1.year } end test "include subdomains" do |