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

2 files changed, 158 insertions, 27 deletions

diff --git a/spec/services/admin/propagate_integration_service_spec.rb b/spec/services/admin/propagate_integration_service_spec.rb
index 2e879cf06d1..49d974b7154 100644
--- a/spec/services/admin/propagate_integration_service_spec.rb
+++ b/spec/services/admin/propagate_integration_service_spec.rb
@@ -4,8 +4,15 @@ require 'spec_helper'
 
 RSpec.describe Admin::PropagateIntegrationService do
   describe '.propagate' do
-    let(:excluded_attributes) { %w[id project_id inherit_from_id instance created_at updated_at default] }
+    include JiraServiceHelper
+
+    before do
+      stub_jira_service_test
+    end
+
+    let(:excluded_attributes) { %w[id project_id group_id inherit_from_id instance created_at updated_at default] }
     let!(:project) { create(:project) }
+    let!(:group) { create(:group) }
     let!(:instance_integration) do
       JiraService.create!(
         instance: true,
@@ -43,7 +50,7 @@ RSpec.describe Admin::PropagateIntegrationService do
       )
     end
 
-    let!(:another_inherited_integration) do
+    let!(:different_type_inherited_integration) do
       BambooService.create!(
         project: create(:project),
         inherit_from_id: instance_integration.id,
@@ -59,7 +66,7 @@ RSpec.describe Admin::PropagateIntegrationService do
 
     shared_examples 'inherits settings from integration' do
       it 'updates the inherited integrations' do
-        described_class.propagate(integration: instance_integration, overwrite: overwrite)
+        described_class.propagate(instance_integration)
 
         expect(integration.reload.inherit_from_id).to eq(instance_integration.id)
         expect(integration.attributes.except(*excluded_attributes))
@@ -70,7 +77,7 @@ RSpec.describe Admin::PropagateIntegrationService do
         let(:excluded_attributes) { %w[id service_id created_at updated_at] }
 
         it 'updates the data fields from inherited integrations' do
-          described_class.propagate(integration: instance_integration, overwrite: overwrite)
+          described_class.propagate(instance_integration)
 
           expect(integration.reload.data_fields.attributes.except(*excluded_attributes))
             .to eq(instance_integration.data_fields.attributes.except(*excluded_attributes))
@@ -80,7 +87,7 @@ RSpec.describe Admin::PropagateIntegrationService do
 
     shared_examples 'does not inherit settings from integration' do
       it 'does not update the not inherited integrations' do
-        described_class.propagate(integration: instance_integration, overwrite: overwrite)
+        described_class.propagate(instance_integration)
 
         expect(integration.reload.attributes.except(*excluded_attributes))
           .not_to eq(instance_integration.attributes.except(*excluded_attributes))
@@ -88,8 +95,6 @@ RSpec.describe Admin::PropagateIntegrationService do
     end
 
     context 'update only inherited integrations' do
-      let(:overwrite) { false }
-
       it_behaves_like 'inherits settings from integration' do
         let(:integration) { inherited_integration }
       end
@@ -99,36 +104,20 @@ RSpec.describe Admin::PropagateIntegrationService do
       end
 
       it_behaves_like 'does not inherit settings from integration' do
-        let(:integration) { another_inherited_integration }
+        let(:integration) { different_type_inherited_integration }
       end
 
       it_behaves_like 'inherits settings from integration' do
         let(:integration) { project.jira_service }
       end
-    end
-
-    context 'update all integrations' do
-      let(:overwrite) { true }
-
-      it_behaves_like 'inherits settings from integration' do
-        let(:integration) { inherited_integration }
-      end
 
       it_behaves_like 'inherits settings from integration' do
-        let(:integration) { not_inherited_integration }
-      end
-
-      it_behaves_like 'does not inherit settings from integration' do
-        let(:integration) { another_inherited_integration }
-      end
-
-      it_behaves_like 'inherits settings from integration' do
-        let(:integration) { project.jira_service }
+        let(:integration) { Service.find_by(group_id: group.id) }
       end
     end
 
     it 'updates project#has_external_issue_tracker for issue tracker services' do
-      described_class.propagate(integration: instance_integration, overwrite: true)
+      described_class.propagate(instance_integration)
 
       expect(project.reload.has_external_issue_tracker).to eq(true)
     end
@@ -141,7 +130,7 @@ RSpec.describe Admin::PropagateIntegrationService do
         external_wiki_url: 'http://external-wiki-url.com'
       )
 
-      described_class.propagate(integration: instance_integration, overwrite: true)
+      described_class.propagate(instance_integration)
 
       expect(project.reload.has_external_wiki).to eq(true)
     end
diff --git a/spec/services/admin/propagate_service_template_spec.rb b/spec/services/admin/propagate_service_template_spec.rb
new file mode 100644
index 00000000000..15654653095
--- /dev/null
+++ b/spec/services/admin/propagate_service_template_spec.rb
@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Admin::PropagateServiceTemplate do
+  describe '.propagate' do
+    let!(:service_template) do
+      PushoverService.create!(
+        template: true,
+        active: true,
+        push_events: false,
+        properties: {
+          device: 'MyDevice',
+          sound: 'mic',
+          priority: 4,
+          user_key: 'asdf',
+          api_key: '123456789'
+        }
+      )
+    end
+
+    let!(:project) { create(:project) }
+    let(:excluded_attributes) { %w[id project_id template created_at updated_at default] }
+
+    it 'creates services for projects' do
+      expect(project.pushover_service).to be_nil
+
+      described_class.propagate(service_template)
+
+      expect(project.reload.pushover_service).to be_present
+    end
+
+    it 'creates services for a project that has another service' do
+      BambooService.create!(
+        active: true,
+        project: project,
+        properties: {
+          bamboo_url: 'http://gitlab.com',
+          username: 'mic',
+          password: 'password',
+          build_key: 'build'
+        }
+      )
+
+      expect(project.pushover_service).to be_nil
+
+      described_class.propagate(service_template)
+
+      expect(project.reload.pushover_service).to be_present
+    end
+
+    it 'does not create the service if it exists already' do
+      other_service = BambooService.create!(
+        template: true,
+        active: true,
+        properties: {
+          bamboo_url: 'http://gitlab.com',
+          username: 'mic',
+          password: 'password',
+          build_key: 'build'
+        }
+      )
+
+      Service.build_from_integration(project.id, service_template).save!
+      Service.build_from_integration(project.id, other_service).save!
+
+      expect { described_class.propagate(service_template) }
+        .not_to change { Service.count }
+    end
+
+    it 'creates the service containing the template attributes' do
+      described_class.propagate(service_template)
+
+      expect(project.pushover_service.properties).to eq(service_template.properties)
+
+      expect(project.pushover_service.attributes.except(*excluded_attributes))
+        .to eq(service_template.attributes.except(*excluded_attributes))
+    end
+
+    context 'service with data fields' do
+      include JiraServiceHelper
+
+      let(:service_template) do
+        stub_jira_service_test
+
+        JiraService.create!(
+          template: true,
+          active: true,
+          push_events: false,
+          url: 'http://jira.instance.com',
+          username: 'user',
+          password: 'secret'
+        )
+      end
+
+      it 'creates the service containing the template attributes' do
+        described_class.propagate(service_template)
+
+        expect(project.jira_service.attributes.except(*excluded_attributes))
+          .to eq(service_template.attributes.except(*excluded_attributes))
+
+        excluded_attributes = %w[id service_id created_at updated_at]
+        expect(project.jira_service.data_fields.attributes.except(*excluded_attributes))
+          .to eq(service_template.data_fields.attributes.except(*excluded_attributes))
+      end
+    end
+
+    describe 'bulk update', :use_sql_query_cache do
+      let(:project_total) { 5 }
+
+      before do
+        stub_const('Admin::PropagateServiceTemplate::BATCH_SIZE', 3)
+
+        project_total.times { create(:project) }
+
+        described_class.propagate(service_template)
+      end
+
+      it 'creates services for all projects' do
+        expect(Service.all.reload.count).to eq(project_total + 2)
+      end
+    end
+
+    describe 'external tracker' do
+      it 'updates the project external tracker' do
+        service_template.update!(category: 'issue_tracker')
+
+        expect { described_class.propagate(service_template) }
+          .to change { project.reload.has_external_issue_tracker }.to(true)
+      end
+    end
+
+    describe 'external wiki' do
+      it 'updates the project external tracker' do
+        service_template.update!(type: 'ExternalWikiService')
+
+        expect { described_class.propagate(service_template) }
+          .to change { project.reload.has_external_wiki }.to(true)
+      end
+    end
+  end
+end