Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

2 files changed, 4 insertions, 55 deletions

diff --git a/spec/services/alert_management/alerts/todo/create_service_spec.rb b/spec/services/alert_management/alerts/todo/create_service_spec.rb
index e3d9de8b4df..fa4fd8ed0b2 100644
--- a/spec/services/alert_management/alerts/todo/create_service_spec.rb
+++ b/spec/services/alert_management/alerts/todo/create_service_spec.rb
@@ -58,6 +58,10 @@ RSpec.describe AlertManagement::Alerts::Todo::CreateService do
             create(:todo, :pending, **todo_params)
           end
 
+          before do
+            stub_feature_flags(multiple_todos: false)
+          end
+
           it 'does not create a todo' do
             expect { result }.not_to change { Todo.count }
           end
diff --git a/spec/services/alert_management/sync_alert_service_data_service_spec.rb b/spec/services/alert_management/sync_alert_service_data_service_spec.rb
deleted file mode 100644
index ecec60011db..00000000000
--- a/spec/services/alert_management/sync_alert_service_data_service_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe AlertManagement::SyncAlertServiceDataService do
-  let_it_be(:alerts_service) do
-    AlertsService.skip_callback(:save, :after, :update_http_integration)
-    service = create(:alerts_service, :active)
-    AlertsService.set_callback(:save, :after, :update_http_integration)
-
-    service
-  end
-
-  describe '#execute' do
-    subject(:execute) { described_class.new(alerts_service).execute }
-
-    context 'without http integration' do
-      it 'creates the integration' do
-        expect { execute }
-          .to change { AlertManagement::HttpIntegration.count }.by(1)
-      end
-
-      it 'returns a success' do
-        expect(subject.success?).to eq(true)
-      end
-    end
-
-    context 'existing legacy http integration' do
-      let_it_be(:integration) { create(:alert_management_http_integration, :legacy, project: alerts_service.project) }
-
-      it 'updates the integration' do
-        expect { execute }
-          .to change { integration.reload.encrypted_token }.to(alerts_service.data.encrypted_token)
-          .and change { integration.encrypted_token_iv }.to(alerts_service.data.encrypted_token_iv)
-      end
-
-      it 'returns a success' do
-        expect(subject.success?).to eq(true)
-      end
-    end
-
-    context 'existing other http integration' do
-      let_it_be(:integration) { create(:alert_management_http_integration, project: alerts_service.project) }
-
-      it 'creates the integration' do
-        expect { execute }
-          .to change { AlertManagement::HttpIntegration.count }.by(1)
-      end
-
-      it 'returns a success' do
-        expect(subject.success?).to eq(true)
-      end
-    end
-  end
-end