diff options
author | Zuhao Wan <wanzuhao@gmail.com> | 2014-06-05 22:52:13 +0800 |
---|---|---|
committer | Zuhao Wan <wanzuhao@gmail.com> | 2014-06-05 22:52:13 +0800 |
commit | e767be0779d24fd64e05a07f0284e79576e2b3c4 (patch) | |
tree | 6180638f75e61b5ecd8fe1326cf1c3cff0b37332 /actionpack/test/dispatch/response_test.rb | |
parent | da19e0d13298bc31051e9c67b5eda206413ae0dc (diff) | |
download | rails-e767be0779d24fd64e05a07f0284e79576e2b3c4.tar.gz rails-e767be0779d24fd64e05a07f0284e79576e2b3c4.tar.bz2 rails-e767be0779d24fd64e05a07f0284e79576e2b3c4.zip |
Restore Response.default_headers after test.
Diffstat (limited to 'actionpack/test/dispatch/response_test.rb')
-rw-r--r-- | actionpack/test/dispatch/response_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb index 959a3bc5cd..187b9a2420 100644 --- a/actionpack/test/dispatch/response_test.rb +++ b/actionpack/test/dispatch/response_test.rb @@ -178,6 +178,7 @@ class ResponseTest < ActiveSupport::TestCase 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 @@ class ResponseTest < ActiveSupport::TestCase 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 @@ class ResponseTest < ActiveSupport::TestCase 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 |