Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/services/system_notes/incident_service_spec.rb b/spec/services/system_notes/incident_service_spec.rb
index ab9b9eb2bd4..669e357b7a4 100644
--- a/spec/services/system_notes/incident_service_spec.rb
+++ b/spec/services/system_notes/incident_service_spec.rb
@@ -56,4 +56,14 @@ RSpec.describe ::SystemNotes::IncidentService do
       end
     end
   end
+
+  describe '#resolve_incident_status' do
+    subject(:resolve_incident_status) { described_class.new(noteable: noteable, project: project, author: author).resolve_incident_status }
+
+    it 'creates a new note about resolved incident', :aggregate_failures do
+      expect { resolve_incident_status }.to change { noteable.notes.count }.by(1)
+
+      expect(noteable.notes.last.note).to eq('changed the status to **Resolved** by closing the incident')
+    end
+  end
 end