Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 5 deletions

diff --git a/spec/services/incident_management/create_issue_service_spec.rb b/spec/services/incident_management/create_issue_service_spec.rb
index 4c7fb682193..bef8b2e5de0 100644
--- a/spec/services/incident_management/create_issue_service_spec.rb
+++ b/spec/services/incident_management/create_issue_service_spec.rb
@@ -281,12 +281,22 @@ describe IncidentManagement::CreateIssueService do
       setting.update!(create_issue: false)
     end
 
-    it 'returns an error' do
-      expect(service)
-        .to receive(:log_error)
-        .with(error_message('setting disabled'))
+    context 'when skip_settings_check is false (default)' do
+      it 'returns an error' do
+        expect(service)
+          .to receive(:log_error)
+          .with(error_message('setting disabled'))
+
+        expect(subject).to eq(status: :error, message: 'setting disabled')
+      end
+    end
+
+    context 'when skip_settings_check is true' do
+      subject { service.execute(skip_settings_check: true) }
 
-      expect(subject).to eq(status: :error, message: 'setting disabled')
+      it 'creates an issue' do
+        expect { subject }.to change(Issue, :count).by(1)
+      end
     end
   end