Merge branch 'master' into 'api-curl-quote-url-docs'api-curl-quote-url-docs

# Conflicts:
#   doc/api/events.md

1 files changed, 121 insertions, 84 deletions

diff --git a/spec/services/merge_requests/create_from_issue_service_spec.rb b/spec/services/merge_requests/create_from_issue_service_spec.rb
index a0ac7dba89d..0e0da6a13ab 100644
--- a/spec/services/merge_requests/create_from_issue_service_spec.rb
+++ b/spec/services/merge_requests/create_from_issue_service_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe MergeRequests::CreateFromIssueService do
+  include ProjectForksHelper
+
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:label_ids) { create_pair(:label, project: project).map(&:id) }
@@ -10,139 +12,174 @@ describe MergeRequests::CreateFromIssueService do
   let(:issue) { create(:issue, project: project, milestone_id: milestone_id) }
   let(:custom_source_branch) { 'custom-source-branch' }
 
-  subject(:service) { described_class.new(project, user, issue_iid: issue.iid) }
-  subject(:service_with_custom_source_branch) { described_class.new(project, user, issue_iid: issue.iid, branch_name: custom_source_branch) }
+  subject(:service) { described_class.new(project, user, service_params) }
+  subject(:service_with_custom_source_branch) { described_class.new(project, user, branch_name: custom_source_branch, **service_params) }
 
   before do
     project.add_developer(user)
   end
 
   describe '#execute' do
-    it 'returns an error with invalid issue iid' do
-      result = described_class.new(project, user, issue_iid: -1).execute
+    shared_examples_for 'a service that creates a merge request from an issue' do
+      it 'returns an error when user can not create merge request on target project' do
+        result = described_class.new(project, create(:user), service_params).execute
 
-      expect(result[:status]).to eq(:error)
-      expect(result[:message]).to eq('Invalid issue iid')
-    end
+        expect(result[:status]).to eq(:error)
+        expect(result[:message]).to eq('Not allowed to create merge request')
+      end
 
-    it 'delegates issue search to IssuesFinder' do
-      expect_any_instance_of(IssuesFinder).to receive(:find_by).once.and_call_original
+      it 'returns an error with invalid issue iid' do
+        result = described_class.new(project, user, issue_iid: -1).execute
 
-      described_class.new(project, user, issue_iid: -1).execute
-    end
-
-    it "inherits labels" do
-      issue.assign_attributes(label_ids: label_ids)
+        expect(result[:status]).to eq(:error)
+        expect(result[:message]).to eq('Invalid issue iid')
+      end
 
-      result = service.execute
+      it 'creates a branch based on issue title' do
+        service.execute
 
-      expect(result[:merge_request].label_ids).to eq(label_ids)
-    end
+        expect(target_project.repository.branch_exists?(issue.to_branch_name)).to be_truthy
+      end
 
-    it "inherits milestones" do
-      result = service.execute
+      it 'creates a branch using passed name' do
+        service_with_custom_source_branch.execute
 
-      expect(result[:merge_request].milestone_id).to eq(milestone_id)
-    end
+        expect(target_project.repository.branch_exists?(custom_source_branch)).to be_truthy
+      end
 
-    it 'delegates the branch creation to CreateBranchService' do
-      expect_any_instance_of(CreateBranchService).to receive(:execute).once.and_call_original
+      it 'creates the new_merge_request system note' do
+        expect(SystemNoteService).to receive(:new_merge_request).with(issue, project, user, instance_of(MergeRequest))
 
-      service.execute
-    end
+        service.execute
+      end
 
-    it 'creates a branch based on issue title' do
-      service.execute
+      it 'creates the new_issue_branch system note when the branch could be created but the merge_request cannot be created' do
+        expect_any_instance_of(MergeRequest).to receive(:valid?).at_least(:once).and_return(false)
 
-      expect(project.repository.branch_exists?(issue.to_branch_name)).to be_truthy
-    end
+        expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, issue.to_branch_name, branch_project: target_project)
 
-    it 'creates a branch using passed name' do
-      service_with_custom_source_branch.execute
+        service.execute
+      end
 
-      expect(project.repository.branch_exists?(custom_source_branch)).to be_truthy
-    end
+      it 'creates a merge request' do
+        expect { service.execute }.to change(target_project.merge_requests, :count).by(1)
+      end
 
-    it 'creates the new_merge_request system note' do
-      expect(SystemNoteService).to receive(:new_merge_request).with(issue, project, user, instance_of(MergeRequest))
+      it 'sets the merge request author to current user' do
+        result = service.execute
 
-      service.execute
-    end
+        expect(result[:merge_request].author).to eq(user)
+      end
 
-    it 'creates the new_issue_branch system note when the branch could be created but the merge_request cannot be created' do
-      project.project_feature.update!(merge_requests_access_level: ProjectFeature::DISABLED)
+      it 'sets the merge request source branch to the new issue branch' do
+        result = service.execute
 
-      expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, issue.to_branch_name)
+        expect(result[:merge_request].source_branch).to eq(issue.to_branch_name)
+      end
 
-      service.execute
-    end
+      it 'sets the merge request source branch to the passed branch name' do
+        result = service_with_custom_source_branch.execute
 
-    it 'creates a merge request' do
-      expect { service.execute }.to change(project.merge_requests, :count).by(1)
-    end
+        expect(result[:merge_request].source_branch).to eq(custom_source_branch)
+      end
 
-    it 'sets the merge request title to: "WIP: Resolves "$issue-title"' do
-      result = service.execute
+      it 'sets the merge request target branch to the project default branch' do
+        result = service.execute
 
-      expect(result[:merge_request].title).to eq("WIP: Resolve \"#{issue.title}\"")
-    end
+        expect(result[:merge_request].target_branch).to eq(target_project.default_branch)
+      end
 
-    it 'sets the merge request author to current user' do
-      result = service.execute
+      it 'executes quick actions if the build service sets them in the description' do
+        allow(service).to receive(:merge_request).and_wrap_original do |m, *args|
+          m.call(*args).tap do |merge_request|
+            merge_request.description = "/assign #{user.to_reference}"
+          end
+        end
 
-      expect(result[:merge_request].author).to eq(user)
-    end
+        result = service.execute
 
-    it 'sets the merge request source branch to the new issue branch' do
-      result = service.execute
+        expect(result[:merge_request].assignees).to eq([user])
+      end
 
-      expect(result[:merge_request].source_branch).to eq(issue.to_branch_name)
-    end
+      context 'when ref branch is set' do
+        subject { described_class.new(project, user, ref: 'feature', **service_params).execute }
 
-    it 'sets the merge request source branch to the passed branch name' do
-      result = service_with_custom_source_branch.execute
+        it 'sets the merge request source branch to the new issue branch' do
+          expect(subject[:merge_request].source_branch).to eq(issue.to_branch_name)
+        end
 
-      expect(result[:merge_request].source_branch).to eq(custom_source_branch)
-    end
+        it 'sets the merge request target branch to the ref branch' do
+          expect(subject[:merge_request].target_branch).to eq('feature')
+        end
 
-    it 'sets the merge request target branch to the project default branch' do
-      result = service.execute
+        context 'when ref branch does not exist' do
+          subject { described_class.new(project, user, ref: 'no-such-branch', **service_params).execute }
 
-      expect(result[:merge_request].target_branch).to eq(project.default_branch)
-    end
+          it 'creates a merge request' do
+            expect { subject }.to change(target_project.merge_requests, :count).by(1)
+          end
 
-    it 'executes quick actions if the build service sets them in the description' do
-      allow(service).to receive(:merge_request).and_wrap_original do |m, *args|
-        m.call(*args).tap do |merge_request|
-          merge_request.description = "/assign #{user.to_reference}"
+          it 'sets the merge request target branch to the project default branch' do
+            expect(subject[:merge_request].target_branch).to eq(target_project.default_branch)
+          end
         end
       end
+    end
 
-      result = service.execute
+    context 'no target_project_id specified' do
+      let(:service_params) { { issue_iid: issue.iid } }
+      let(:target_project) { project }
 
-      expect(result[:merge_request].assignees).to eq([user])
-    end
+      it_behaves_like 'a service that creates a merge request from an issue'
 
-    context 'when ref branch is set' do
-      subject { described_class.new(project, user, issue_iid: issue.iid, ref: 'feature').execute }
+      it "inherits labels" do
+        issue.assign_attributes(label_ids: label_ids)
 
-      it 'sets the merge request source branch to the new issue branch' do
-        expect(subject[:merge_request].source_branch).to eq(issue.to_branch_name)
+        result = service.execute
+
+        expect(result[:merge_request].label_ids).to eq(label_ids)
       end
 
-      it 'sets the merge request target branch to the ref branch' do
-        expect(subject[:merge_request].target_branch).to eq('feature')
+      it "inherits milestones" do
+        result = service.execute
+
+        expect(result[:merge_request].milestone_id).to eq(milestone_id)
       end
 
-      context 'when ref branch does not exist' do
-        subject { described_class.new(project, user, issue_iid: issue.iid, ref: 'no-such-branch').execute }
+      it 'sets the merge request title to: "WIP: Resolves "$issue-title"' do
+        result = service.execute
 
-        it 'creates a merge request' do
-          expect { subject }.to change(project.merge_requests, :count).by(1)
+        expect(result[:merge_request].title).to eq("WIP: Resolve \"#{issue.title}\"")
+      end
+    end
+
+    context 'target_project_id is specified' do
+      let(:service_params) { { issue_iid: issue.iid, target_project_id: target_project.id } }
+
+      context 'target project is not a fork of the project' do
+        let(:target_project) { create(:project, :repository) }
+
+        it 'returns an error about not finding the project' do
+          result = service.execute
+
+          expect(result[:status]).to eq(:error)
+          expect(result[:message]).to eq('Project not found')
         end
 
-        it 'sets the merge request target branch to the project default branch' do
-          expect(subject[:merge_request].target_branch).to eq(project.default_branch)
+        it 'does not create merge request' do
+          expect { service.execute }.to change(target_project.merge_requests, :count).by(0)
+        end
+      end
+
+      context 'target project is a fork of project project' do
+        let(:target_project) { fork_project(project, user, repository: true) }
+
+        it_behaves_like 'a service that creates a merge request from an issue'
+
+        it 'sets the merge request title to: "WIP: $issue-branch-name' do
+          result = service.execute
+
+          expect(result[:merge_request].title).to eq("WIP: #{issue.to_branch_name.titleize.humanize}")
         end
       end
     end