Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 1 deletions

diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index b5811077acf..0c28ceb7466 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -52,7 +52,8 @@ RSpec.describe Issues::UpdateService, :mailer do
           state_event: 'close',
           label_ids: [label.id],
           due_date: Date.tomorrow,
-          discussion_locked: true
+          discussion_locked: true,
+          severity: 'low'
         }
       end
 
@@ -71,6 +72,24 @@ RSpec.describe Issues::UpdateService, :mailer do
         expect(issue.discussion_locked).to be_truthy
       end
 
+      context 'when issue type is not incident' do
+        it 'returns default severity' do
+          update_issue(opts)
+
+          expect(issue.severity).to eq(IssuableSeverity::DEFAULT)
+        end
+      end
+
+      context 'when issue type is incident' do
+        let(:issue) { create(:incident, project: project) }
+
+        it 'changes updates the severity' do
+          update_issue(opts)
+
+          expect(issue.severity).to eq('low')
+        end
+      end
+
       it 'refreshes the number of open issues when the issue is made confidential', :use_clean_rails_memory_store_caching do
         issue # make sure the issue is created first so our counts are correct.