aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAndrew White <andrew.white@unboxed.co>2018-02-19 12:00:29 +0000
committerAndrew White <andrew.white@unboxed.co>2018-02-19 12:00:29 +0000
commit52a1f1c226c2238e16d1a4d32faa8d1e6a36a26f (patch)
tree7c222df8b38bdd3cb285c95b0dd067ed9c63ae1b /railties
parentf712ef27c55fc4210a722d447e05271adef1e57f (diff)
downloadrails-52a1f1c226c2238e16d1a4d32faa8d1e6a36a26f.tar.gz
rails-52a1f1c226c2238e16d1a4d32faa8d1e6a36a26f.tar.bz2
rails-52a1f1c226c2238e16d1a4d32faa8d1e6a36a26f.zip
Revert "Merge pull request #32045 from eagletmt/skip-csp-header"
This reverts commit 86f7c269073a3a9e6ddec9b957deaa2716f2627d, reversing changes made to 5ece2e4a4459065b5efd976aebd209bbf0cab89b. If a policy is set then we should generate it even if it's empty. However what is happening is that we're accidentally generating an empty policy when the initializer is commented out by default.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/content_security_policy_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/content_security_policy_test.rb b/railties/test/application/content_security_policy_test.rb
index 1539bf4440..97f2957c33 100644
--- a/railties/test/application/content_security_policy_test.rb
+++ b/railties/test/application/content_security_policy_test.rb
@@ -34,7 +34,7 @@ module ApplicationTests
app("development")
get "/"
- assert_not last_response.headers.key?("Content-Security-Policy")
+ assert_equal ";", last_response.headers["Content-Security-Policy"]
end
test "global content security policy in an initializer" do