diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 09:09:23 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 09:09:23 +0000 |
commit | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (patch) | |
tree | 82591df15758864325897043f855b4e4dfcb6a56 /spec/models | |
parent | 0301a0cad0063d76b1607358dc6c711ea043fdda (diff) | |
download | gitlab-ce-4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/clusters/applications/ingress_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb index 754e26dcec8..b1dd8ede3eb 100644 --- a/spec/models/clusters/applications/ingress_spec.rb +++ b/spec/models/clusters/applications/ingress_spec.rb @@ -177,6 +177,7 @@ describe Clusters::Applications::Ingress do context 'when modsecurity_enabled is disabled' do before do allow(subject).to receive(:cluster).and_return(cluster) + allow(subject).to receive(:modsecurity_enabled).and_return(false) end it 'excludes modsecurity module enablement' do |