Add latest changes from gitlab-org/gitlab@master

4 files changed, 193 insertions, 0 deletions

diff --git a/spec/services/deployments/link_merge_requests_service_spec.rb b/spec/services/deployments/link_merge_requests_service_spec.rb
index a5a13230d6f..62adc834733 100644
--- a/spec/services/deployments/link_merge_requests_service_spec.rb
+++ b/spec/services/deployments/link_merge_requests_service_spec.rb
@@ -32,6 +32,19 @@ RSpec.describe Deployments::LinkMergeRequestsService do
       end
     end
 
+    context 'when the deployment is for one of the production environments' do
+      it 'links merge requests' do
+        environment =
+          create(:environment, environment_type: 'production', name: 'production/gcp')
+
+        deploy = create(:deployment, :success, environment: environment)
+
+        expect(deploy).to receive(:link_merge_requests).once
+
+        described_class.new(deploy).execute
+      end
+    end
+
     context 'when the deployment failed' do
       it 'does nothing' do
         environment = create(:environment, name: 'foo')
diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb
index 2e6e6041fc3..1c71715d922 100644
--- a/spec/services/members/create_service_spec.rb
+++ b/spec/services/members/create_service_spec.rb
@@ -196,4 +196,110 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_
       end
     end
   end
+
+  context 'when assigning tasks to be done' do
+    let(:additional_params) do
+      { invite_source: '_invite_source_', tasks_to_be_done: %w(ci code), tasks_project_id: source.id }
+    end
+
+    before do
+      stub_experiments(invite_members_for_task: true)
+    end
+
+    it 'creates 2 task issues', :aggregate_failures do
+      expect(TasksToBeDone::CreateWorker)
+        .to receive(:perform_async)
+        .with(anything, user.id, [member.id])
+        .once
+        .and_call_original
+      expect { execute_service }.to change { source.issues.count }.by(2)
+
+      expect(source.issues).to all have_attributes(
+        project: source,
+        author: user,
+        assignees: array_including(member)
+      )
+    end
+
+    context 'when passing many user ids' do
+      before do
+        stub_licensed_features(multiple_issue_assignees: false)
+      end
+
+      let(:another_user) { create(:user) }
+      let(:user_ids) { [member.id, another_user.id].join(',') }
+
+      it 'still creates 2 task issues', :aggregate_failures do
+        expect(TasksToBeDone::CreateWorker)
+          .to receive(:perform_async)
+          .with(anything, user.id, array_including(member.id, another_user.id))
+          .once
+          .and_call_original
+        expect { execute_service }.to change { source.issues.count }.by(2)
+
+        expect(source.issues).to all have_attributes(
+          project: source,
+          author: user,
+          assignees: array_including(member)
+        )
+      end
+    end
+
+    context 'when a `tasks_project_id` is missing' do
+      let(:additional_params) do
+        { invite_source: '_invite_source_', tasks_to_be_done: %w(ci code) }
+      end
+
+      it 'does not create task issues' do
+        expect(TasksToBeDone::CreateWorker).not_to receive(:perform_async)
+        execute_service
+      end
+    end
+
+    context 'when `tasks_to_be_done` are missing' do
+      let(:additional_params) do
+        { invite_source: '_invite_source_', tasks_project_id: source.id }
+      end
+
+      it 'does not create task issues' do
+        expect(TasksToBeDone::CreateWorker).not_to receive(:perform_async)
+        execute_service
+      end
+    end
+
+    context 'when invalid `tasks_to_be_done` are passed' do
+      let(:additional_params) do
+        { invite_source: '_invite_source_', tasks_project_id: source.id, tasks_to_be_done: %w(invalid_task) }
+      end
+
+      it 'does not create task issues' do
+        expect(TasksToBeDone::CreateWorker).not_to receive(:perform_async)
+        execute_service
+      end
+    end
+
+    context 'when invalid `tasks_project_id` is passed' do
+      let(:another_project) { create(:project) }
+      let(:additional_params) do
+        { invite_source: '_invite_source_', tasks_project_id: another_project.id, tasks_to_be_done: %w(ci code) }
+      end
+
+      it 'does not create task issues' do
+        expect(TasksToBeDone::CreateWorker).not_to receive(:perform_async)
+        execute_service
+      end
+    end
+
+    context 'when a member was already invited' do
+      let(:user_ids) { create(:project_member, :invited, project: source).invite_email }
+      let(:additional_params) do
+        { invite_source: '_invite_source_', tasks_project_id: source.id, tasks_to_be_done: %w(ci code) }
+      end
+
+      it 'does not create task issues' do
+        expect(TasksToBeDone::CreateWorker).not_to receive(:perform_async)
+        execute_service
+      end
+    end
+  end
 end
diff --git a/spec/services/members/invite_service_spec.rb b/spec/services/members/invite_service_spec.rb
index 478733e8aa0..7b9ae19f038 100644
--- a/spec/services/members/invite_service_spec.rb
+++ b/spec/services/members/invite_service_spec.rb
@@ -22,6 +22,11 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_
     end
 
     it_behaves_like 'records an onboarding progress action', :user_added
+
+    it 'does not create task issues' do
+      expect(TasksToBeDone::CreateWorker).not_to receive(:perform_async)
+      expect { result }.not_to change { project.issues.count }
+    end
   end
 
   context 'when email belongs to an existing user as a secondary email' do
diff --git a/spec/services/tasks_to_be_done/base_service_spec.rb b/spec/services/tasks_to_be_done/base_service_spec.rb
new file mode 100644
index 00000000000..bf6be6d46e5
--- /dev/null
+++ b/spec/services/tasks_to_be_done/base_service_spec.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe TasksToBeDone::BaseService do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:assignee_one) { create(:user) }
+  let_it_be(:assignee_two) { create(:user) }
+  let_it_be(:assignee_ids) { [assignee_one.id] }
+  let_it_be(:label) { create(:label, title: 'tasks to be done:ci', project: project) }
+
+  before do
+    project.add_maintainer(current_user)
+    project.add_developer(assignee_one)
+    project.add_developer(assignee_two)
+  end
+
+  subject(:service) do
+    TasksToBeDone::CreateCiTaskService.new(
+      project: project,
+      current_user: current_user,
+      assignee_ids: assignee_ids
+    )
+  end
+
+  context 'no existing task issue', :aggregate_failures do
+    it 'creates an issue' do
+      params = {
+        assignee_ids: assignee_ids,
+        title: 'Set up CI/CD',
+        description: anything,
+        add_labels: label.title
+      }
+
+      expect(Issues::BuildService)
+        .to receive(:new)
+        .with(project: project, current_user: current_user, params: params)
+        .and_call_original
+
+      expect { service.execute }.to change(Issue, :count).by(1)
+
+      expect(project.issues.last).to have_attributes(
+        author: current_user,
+        title: params[:title],
+        assignees: [assignee_one],
+        labels: [label]
+      )
+    end
+  end
+
+  context 'an open issue with the same label already exists', :aggregate_failures do
+    let_it_be(:assignee_ids) { [assignee_two.id] }
+
+    it 'assigns the user to the existing issue' do
+      issue = create(:labeled_issue, project: project, labels: [label], assignees: [assignee_one])
+      params = { add_assignee_ids: assignee_ids }
+
+      expect(Issues::UpdateService)
+        .to receive(:new)
+        .with(project: project, current_user: current_user, params: params)
+        .and_call_original
+
+      expect { service.execute }.not_to change(Issue, :count)
+
+      expect(issue.reload.assignees).to match_array([assignee_one, assignee_two])
+    end
+  end
+end