Permalink
Browse files

Restore Response.default_headers after test.

  • Loading branch information...
1 parent da19e0d commit e767be0779d24fd64e05a07f0284e79576e2b3c4 @zuhao zuhao committed Jun 5, 2014
Showing with 4 additions and 2 deletions.
  1. +4 −2 actionpack/test/dispatch/response_test.rb
@@ -178,6 +178,7 @@ def test_response_body_encoding
end
test "read x_frame_options, x_content_type_options and x_xss_protection" do
+ original_default_headers = ActionDispatch::Response.default_headers
begin
ActionDispatch::Response.default_headers = {
'X-Frame-Options' => 'DENY',
@@ -193,11 +194,12 @@ def test_response_body_encoding
assert_equal('nosniff', resp.headers['X-Content-Type-Options'])
assert_equal('1;', resp.headers['X-XSS-Protection'])
ensure
- ActionDispatch::Response.default_headers = nil
+ ActionDispatch::Response.default_headers = original_default_headers
end
end
test "read custom default_header" do
+ original_default_headers = ActionDispatch::Response.default_headers
begin
ActionDispatch::Response.default_headers = {
'X-XX-XXXX' => 'Here is my phone number'
@@ -209,7 +211,7 @@ def test_response_body_encoding
assert_equal('Here is my phone number', resp.headers['X-XX-XXXX'])
ensure
- ActionDispatch::Response.default_headers = nil
+ ActionDispatch::Response.default_headers = original_default_headers
end
end

0 comments on commit e767be0

Please sign in to comment.