summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-11-01 09:25:49 +0000
committerMichael Kozono <mkozono@gmail.com>2017-11-08 20:11:18 -0800
commit20ac30a705f4edd22efd934ecf68b58557f868db (patch)
tree0057e7dbc3e7925bc8e0b3353fb460acb05f5478 /spec/support
parent89bd78352e4c575a0293f9c431dd677d288d28d2 (diff)
downloadgitlab-ce-20ac30a705f4edd22efd934ecf68b58557f868db.tar.gz
Merge branch '36099-api-responses-missing-x-content-type-options-header' into '10-1-stable'
Include X-Content-Type-Options (XCTO) header into API responses See merge request gitlab/gitlabhq!2211 (cherry picked from commit 6c818e77f2abeef2dd7b17a269611b018701fa79) e087e075 Include X-Content-Type-Options (XCTO) header into API responses
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/matchers/security_header_matcher.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/support/matchers/security_header_matcher.rb b/spec/support/matchers/security_header_matcher.rb
new file mode 100644
index 00000000000..f8518d13ebb
--- /dev/null
+++ b/spec/support/matchers/security_header_matcher.rb
@@ -0,0 +1,5 @@
+RSpec::Matchers.define :include_security_headers do |expected|
+ match do |actual|
+ expect(actual.headers).to include('X-Content-Type-Options')
+ end
+end