Add latest changes from gitlab-org/gitlab@13-3-stable-ee

2 files changed, 1 insertions, 4 deletions

diff --git a/spec/services/alert_management/alerts/update_service_spec.rb b/spec/services/alert_management/alerts/update_service_spec.rb
index 91b02325bad..ee04fc55984 100644
--- a/spec/services/alert_management/alerts/update_service_spec.rb
+++ b/spec/services/alert_management/alerts/update_service_spec.rb
@@ -147,8 +147,7 @@ RSpec.describe AlertManagement::Alerts::UpdateService do
         end
 
         it_behaves_like 'does not add a system note'
-        # TODO: We should not add another todo in this scenario
-        it_behaves_like 'adds a todo'
+        it_behaves_like 'does not add a todo'
       end
 
       context 'with multiple users included' do
diff --git a/spec/services/alert_management/create_alert_issue_service_spec.rb b/spec/services/alert_management/create_alert_issue_service_spec.rb
index a8f2b4ee09c..cf24188a738 100644
--- a/spec/services/alert_management/create_alert_issue_service_spec.rb
+++ b/spec/services/alert_management/create_alert_issue_service_spec.rb
@@ -88,7 +88,6 @@ RSpec.describe AlertManagement::CreateAlertIssueService do
 
         it_behaves_like 'creating an alert issue'
         it_behaves_like 'setting an issue attributes'
-        it_behaves_like 'create alert issue sets issue labels'
       end
 
       context 'when the alert is generic' do
@@ -97,7 +96,6 @@ RSpec.describe AlertManagement::CreateAlertIssueService do
 
         it_behaves_like 'creating an alert issue'
         it_behaves_like 'setting an issue attributes'
-        it_behaves_like 'create alert issue sets issue labels'
       end
 
       context 'when issue cannot be created' do