aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/static_test.rb
diff options
context:
space:
mode:
authorKohei Suzuki <eagletmt@gmail.com>2015-03-12 23:14:01 +0900
committerKohei Suzuki <eagletmt@gmail.com>2015-03-12 23:32:07 +0900
commitb60c1fe97be3af8baf982aaa4638811a37f7a7e9 (patch)
tree6129a4aaab30e5e20c3e3fdfc261996f9e29ef24 /actionpack/test/dispatch/static_test.rb
parentd4103fc232044625c6ba4692b4c9bd8779e97ba5 (diff)
downloadrails-b60c1fe97be3af8baf982aaa4638811a37f7a7e9.tar.gz
rails-b60c1fe97be3af8baf982aaa4638811a37f7a7e9.tar.bz2
rails-b60c1fe97be3af8baf982aaa4638811a37f7a7e9.zip
Also skip Content-Encoding and Vary header if 304
Diffstat (limited to 'actionpack/test/dispatch/static_test.rb')
-rw-r--r--actionpack/test/dispatch/static_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 9164cbd3aa..288a2084f6 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -149,7 +149,8 @@ module StaticTests
response = get(file_name, 'HTTP_ACCEPT_ENCODING' => 'gzip', 'HTTP_IF_MODIFIED_SINCE' => last_modified.httpdate)
assert_equal 304, response.status
assert_equal nil, response.headers['Content-Type']
- assert_equal 'gzip', response.headers['Content-Encoding']
+ assert_equal nil, response.headers['Content-Encoding']
+ assert_equal nil, response.headers['Vary']
end
# Windows doesn't allow \ / : * ? " < > | in filenames