diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2013-01-14 23:47:30 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2013-01-14 23:47:30 -0800 |
| commit | 390ad458b46c0df105a0dd3381f5912b96ba8ea3 (patch) | |
| tree | fa9da895dfb1331be5983efeef0f1a84550103f7 /railties | |
| parent | d040b3ded0a794b955b3c6f99fe15ab2f64ee3d6 (diff) | |
| parent | dcb05f264af2ebbd3bbff6e8473ebe27771eb4f1 (diff) | |
| download | rails-390ad458b46c0df105a0dd3381f5912b96ba8ea3.tar.gz rails-390ad458b46c0df105a0dd3381f5912b96ba8ea3.tar.bz2 rails-390ad458b46c0df105a0dd3381f5912b96ba8ea3.zip | |
Merge pull request #8946 from reednj77/rack-cache-headers
Account for ignored cookie set by turbolinks
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/middleware/cache_test.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb index c99666d7e4..b8e0c9be60 100644 --- a/railties/test/application/middleware/cache_test.rb +++ b/railties/test/application/middleware/cache_test.rb @@ -81,8 +81,8 @@ module ApplicationTests add_to_config "config.action_dispatch.rack_cache = true" get "/expires/expires_header" - assert_equal "miss, store", last_response.headers["X-Rack-Cache"] - assert_equal "max-age=10, public", last_response.headers["Cache-Control"] + assert_equal "miss, ignore, store", last_response.headers["X-Rack-Cache"] + assert_equal "max-age=10, public", last_response.headers["Cache-Control"] body = last_response.body @@ -115,8 +115,8 @@ module ApplicationTests add_to_config "config.action_dispatch.rack_cache = true" get "/expires/expires_etag" - assert_equal "miss, store", last_response.headers["X-Rack-Cache"] - assert_equal "public", last_response.headers["Cache-Control"] + assert_equal "miss, ignore, store", last_response.headers["X-Rack-Cache"] + assert_equal "public", last_response.headers["Cache-Control"] body = last_response.body etag = last_response.headers["ETag"] @@ -149,8 +149,8 @@ module ApplicationTests add_to_config "config.action_dispatch.rack_cache = true" get "/expires/expires_last_modified" - assert_equal "miss, store", last_response.headers["X-Rack-Cache"] - assert_equal "public", last_response.headers["Cache-Control"] + assert_equal "miss, ignore, store", last_response.headers["X-Rack-Cache"] + assert_equal "public", last_response.headers["Cache-Control"] body = last_response.body last = last_response.headers["Last-Modified"] |