diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 21:09:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 21:09:45 +0000 |
commit | dd4bee69b7d55620f7dc9db8c36b478bd4959755 (patch) | |
tree | 78ba4c486ad8aa2d5effaccf23241ffb6c6dde26 /spec/support/shared_examples | |
parent | ce8a0b90849ac5d1895e741c023432930f24d724 (diff) | |
download | gitlab-ce-dd4bee69b7d55620f7dc9db8c36b478bd4959755.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/shared_examples')
-rw-r--r-- | spec/support/shared_examples/csp.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/spec/support/shared_examples/csp.rb b/spec/support/shared_examples/csp.rb index 10c4158522f..c4a8c7df898 100644 --- a/spec/support/shared_examples/csp.rb +++ b/spec/support/shared_examples/csp.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.shared_examples 'setting CSP connect-src' do +RSpec.shared_examples 'setting CSP' do |rule_name| let_it_be(:default_csp_values) { "'self' https://some-cdn.test" } shared_context 'csp config' do |csp_rule| @@ -10,7 +10,7 @@ RSpec.shared_examples 'setting CSP connect-src' do end expect_next_instance_of(extended_controller_class) do |controller| - expect(controller).to receive(:current_content_security_policy).and_return(csp) + expect(controller).to receive(:current_content_security_policy).at_least(:once).and_return(csp) end end end @@ -23,55 +23,55 @@ RSpec.shared_examples 'setting CSP connect-src' do end end - describe 'when a CSP config exists for connect-src' do - include_context 'csp config', :connect_src + describe "when a CSP config exists for #{rule_name}" do + include_context 'csp config', rule_name.parameterize.underscore.to_sym context 'when feature is enabled' do - it 'appends to connect-src' do - is_expected.to eql("connect-src #{default_csp_values} #{whitelisted_url}") + it "appends to #{rule_name}" do + is_expected.to eql("#{rule_name} #{default_csp_values} #{whitelisted_url}") end end context 'when feature is disabled' do include_context 'disable feature' - it 'keeps original connect-src' do - is_expected.to eql("connect-src #{default_csp_values}") + it "keeps original #{rule_name}" do + is_expected.to eql("#{rule_name} #{default_csp_values}") end end end - describe 'when a CSP config exists for default-src but not connect-src' do + describe "when a CSP config exists for default-src but not #{rule_name}" do include_context 'csp config', :default_src context 'when feature is enabled' do - it 'uses default-src values in connect-src' do - is_expected.to eql("default-src #{default_csp_values}; connect-src #{default_csp_values} #{whitelisted_url}") + it "uses default-src values in #{rule_name}" do + is_expected.to eql("default-src #{default_csp_values}; #{rule_name} #{default_csp_values} #{whitelisted_url}") end end context 'when feature is disabled' do include_context 'disable feature' - it 'does not add connect-src' do + it "does not add #{rule_name}" do is_expected.to eql("default-src #{default_csp_values}") end end end - describe 'when a CSP config exists for font-src but not connect-src' do + describe "when a CSP config exists for font-src but not #{rule_name}" do include_context 'csp config', :font_src context 'when feature is enabled' do - it 'uses default-src values in connect-src' do - is_expected.to eql("font-src #{default_csp_values}; connect-src #{whitelisted_url}") + it "uses default-src values in #{rule_name}" do + is_expected.to eql("font-src #{default_csp_values}; #{rule_name} #{whitelisted_url}") end end context 'when feature is disabled' do include_context 'disable feature' - it 'does not add connect-src' do + it "does not add #{rule_name}" do is_expected.to eql("font-src #{default_csp_values}") end end |