6c27c0d394
Reusing the existing `IssuableBaseService#filter_params` which uses the policies to determine what params a user can set, and which values it can be set to. This also removed the need for the seperate call to `IssuableBaseService#ensure_milestone_available`. The `Issues::BuildService` does not suffer from this because it limits the params that are assignable to the `title`, `description` and `milestone_id`.
517 lines
18 KiB
Ruby
517 lines
18 KiB
Ruby
# frozen_string_literal: true
|
|
require 'spec_helper'
|
|
|
|
describe MergeRequests::BuildService do
|
|
using RSpec::Parameterized::TableSyntax
|
|
include RepoHelpers
|
|
include ProjectForksHelper
|
|
|
|
let(:project) { create(:project, :repository) }
|
|
let(:source_project) { nil }
|
|
let(:target_project) { nil }
|
|
let(:user) { create(:user) }
|
|
let(:issue_confidential) { false }
|
|
let(:issue) { create(:issue, project: project, title: 'A bug', confidential: issue_confidential) }
|
|
let(:description) { nil }
|
|
let(:source_branch) { 'feature-branch' }
|
|
let(:target_branch) { 'master' }
|
|
let(:milestone_id) { nil }
|
|
let(:label_ids) { [] }
|
|
let(:merge_request) { service.execute }
|
|
let(:compare) { double(:compare, commits: commits) }
|
|
let(:commit_1) { double(:commit_1, sha: 'f00ba7', safe_message: "Initial commit\n\nCreate the app") }
|
|
let(:commit_2) { double(:commit_2, sha: 'f00ba7', safe_message: 'This is a bad commit message!') }
|
|
let(:commits) { nil }
|
|
|
|
let(:params) do
|
|
{
|
|
description: description,
|
|
source_branch: source_branch,
|
|
target_branch: target_branch,
|
|
source_project: source_project,
|
|
target_project: target_project,
|
|
milestone_id: milestone_id,
|
|
label_ids: label_ids
|
|
}
|
|
end
|
|
|
|
let(:service) do
|
|
described_class.new(project, user, params)
|
|
end
|
|
|
|
before do
|
|
project.add_guest(user)
|
|
end
|
|
|
|
def stub_compare
|
|
allow(CompareService).to receive_message_chain(:new, :execute).and_return(compare)
|
|
allow(project).to receive(:commit).and_return(commit_1)
|
|
allow(project).to receive(:commit).and_return(commit_2)
|
|
end
|
|
|
|
describe '#execute' do
|
|
it 'calls the compare service with the correct arguments' do
|
|
allow_any_instance_of(described_class).to receive(:projects_and_branches_valid?).and_return(true)
|
|
expect(CompareService).to receive(:new)
|
|
.with(project, Gitlab::Git::BRANCH_REF_PREFIX + source_branch)
|
|
.and_call_original
|
|
|
|
expect_any_instance_of(CompareService).to receive(:execute)
|
|
.with(project, Gitlab::Git::BRANCH_REF_PREFIX + target_branch)
|
|
.and_call_original
|
|
|
|
merge_request
|
|
end
|
|
|
|
it 'does not assign force_remove_source_branch' do
|
|
expect(merge_request.force_remove_source_branch?).to be_falsey
|
|
end
|
|
|
|
context 'with force_remove_source_branch parameter' do
|
|
let(:mr_params) { params.merge(force_remove_source_branch: '1') }
|
|
let(:merge_request) { described_class.new(project, user, mr_params).execute }
|
|
|
|
it 'assigns force_remove_source_branch' do
|
|
expect(merge_request.force_remove_source_branch?).to be_truthy
|
|
end
|
|
end
|
|
|
|
context 'missing source branch' do
|
|
let(:source_branch) { '' }
|
|
|
|
it 'forbids the merge request from being created' do
|
|
expect(merge_request.can_be_created).to eq(false)
|
|
end
|
|
|
|
it 'adds an error message to the merge request' do
|
|
expect(merge_request.errors).to contain_exactly('You must select source and target branch')
|
|
end
|
|
end
|
|
|
|
context 'when target branch is missing' do
|
|
let(:target_branch) { nil }
|
|
let(:commits) { Commit.decorate([commit_1], project) }
|
|
|
|
before do
|
|
stub_compare
|
|
end
|
|
|
|
it 'creates compare object with target branch as default branch' do
|
|
expect(merge_request.compare).to be_present
|
|
expect(merge_request.target_branch).to eq(project.default_branch)
|
|
end
|
|
|
|
it 'allows the merge request to be created' do
|
|
expect(merge_request.can_be_created).to eq(true)
|
|
end
|
|
end
|
|
|
|
context 'same source and target branch' do
|
|
let(:source_branch) { 'master' }
|
|
|
|
it 'forbids the merge request from being created' do
|
|
expect(merge_request.can_be_created).to eq(false)
|
|
end
|
|
|
|
it 'adds an error message to the merge request' do
|
|
expect(merge_request.errors).to contain_exactly('You must select different branches')
|
|
end
|
|
end
|
|
|
|
context 'no commits in the diff' do
|
|
let(:commits) { [] }
|
|
|
|
before do
|
|
stub_compare
|
|
end
|
|
|
|
it 'allows the merge request to be created' do
|
|
expect(merge_request.can_be_created).to eq(true)
|
|
end
|
|
|
|
it 'adds a WIP prefix to the merge request title' do
|
|
expect(merge_request.title).to eq('WIP: Feature branch')
|
|
end
|
|
end
|
|
|
|
context 'one commit in the diff' do
|
|
let(:commits) { Commit.decorate([commit_1], project) }
|
|
let(:commit_description) { commit_1.safe_message.split(/\n+/, 2).last }
|
|
|
|
before do
|
|
stub_compare
|
|
end
|
|
|
|
it 'allows the merge request to be created' do
|
|
expect(merge_request.can_be_created).to eq(true)
|
|
end
|
|
|
|
it 'uses the title of the commit as the title of the merge request' do
|
|
expect(merge_request.title).to eq(commit_1.safe_message.split("\n").first)
|
|
end
|
|
|
|
it 'uses the description of the commit as the description of the merge request' do
|
|
expect(merge_request.description).to eq(commit_description)
|
|
end
|
|
|
|
context 'merge request already has a description set' do
|
|
let(:description) { 'Merge request description' }
|
|
|
|
it 'keeps the description from the initial params' do
|
|
expect(merge_request.description).to eq(description)
|
|
end
|
|
end
|
|
|
|
context 'commit has no description' do
|
|
let(:commits) { Commit.decorate([commit_2], project) }
|
|
|
|
it 'uses the title of the commit as the title of the merge request' do
|
|
expect(merge_request.title).to eq(commit_2.safe_message)
|
|
end
|
|
|
|
it 'sets the description to nil' do
|
|
expect(merge_request.description).to be_nil
|
|
end
|
|
end
|
|
|
|
context 'when the source branch matches an issue' do
|
|
where(:issue_tracker, :source_branch, :closing_message) do
|
|
:jira | 'FOO-123-fix-issue' | 'Closes FOO-123'
|
|
:jira | 'fix-issue' | nil
|
|
:custom_issue_tracker | '123-fix-issue' | 'Closes #123'
|
|
:custom_issue_tracker | 'fix-issue' | nil
|
|
:internal | '123-fix-issue' | 'Closes #123'
|
|
:internal | 'fix-issue' | nil
|
|
end
|
|
|
|
with_them do
|
|
before do
|
|
if issue_tracker == :internal
|
|
issue.update!(iid: 123)
|
|
else
|
|
create(:"#{issue_tracker}_service", project: project)
|
|
end
|
|
end
|
|
|
|
it 'uses the title of the commit as the title of the merge request' do
|
|
expect(merge_request.title).to eq('Initial commit')
|
|
end
|
|
|
|
it 'appends the closing description' do
|
|
expected_description = [commit_description, closing_message].compact.join("\n\n")
|
|
|
|
expect(merge_request.description).to eq(expected_description)
|
|
end
|
|
end
|
|
|
|
context 'when the source branch matches an internal issue' do
|
|
let(:label) { create(:label, project: project) }
|
|
let(:milestone) { create(:milestone, project: project) }
|
|
let(:source_branch) { '123-fix-issue' }
|
|
|
|
before do
|
|
issue.update!(iid: 123, labels: [label], milestone: milestone)
|
|
end
|
|
|
|
it 'assigns the issue label and milestone' do
|
|
expect(merge_request.milestone).to eq(milestone)
|
|
expect(merge_request.labels).to match_array([label])
|
|
end
|
|
|
|
context 'when milestone_id and label_ids are shared in the params' do
|
|
let(:label2) { create(:label, project: project) }
|
|
let(:milestone2) { create(:milestone, project: project) }
|
|
let(:label_ids) { [label2.id] }
|
|
let(:milestone_id) { milestone2.id }
|
|
|
|
before do
|
|
# Guests are not able to assign labels or milestones to an issue
|
|
project.add_developer(user)
|
|
end
|
|
|
|
it 'assigns milestone_id and label_ids instead of issue labels and milestone' do
|
|
expect(merge_request.milestone).to eq(milestone2)
|
|
expect(merge_request.labels).to match_array([label2])
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when a milestone is from another project' do
|
|
let(:milestone) { create(:milestone, project: create(:project)) }
|
|
let(:milestone_id) { milestone.id }
|
|
|
|
it 'sets milestone to nil' do
|
|
expect(merge_request.milestone).to be_nil
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'more than one commit in the diff' do
|
|
let(:commits) { Commit.decorate([commit_1, commit_2], project) }
|
|
|
|
before do
|
|
stub_compare
|
|
end
|
|
|
|
it 'allows the merge request to be created' do
|
|
expect(merge_request.can_be_created).to eq(true)
|
|
end
|
|
|
|
it 'uses the title of the branch as the merge request title' do
|
|
expect(merge_request.title).to eq('Feature branch')
|
|
end
|
|
|
|
it 'does not add a description' do
|
|
expect(merge_request.description).to be_nil
|
|
end
|
|
|
|
context 'merge request already has a description set' do
|
|
let(:description) { 'Merge request description' }
|
|
|
|
it 'keeps the description from the initial params' do
|
|
expect(merge_request.description).to eq(description)
|
|
end
|
|
end
|
|
|
|
context 'when the source branch matches an issue' do
|
|
where(:issue_tracker, :source_branch, :title, :closing_message) do
|
|
:jira | 'FOO-123-fix-issue' | 'Resolve FOO-123 "Fix issue"' | 'Closes FOO-123'
|
|
:jira | 'fix-issue' | 'Fix issue' | nil
|
|
:custom_issue_tracker | '123-fix-issue' | 'Resolve #123 "Fix issue"' | 'Closes #123'
|
|
:custom_issue_tracker | 'fix-issue' | 'Fix issue' | nil
|
|
:internal | '123-fix-issue' | 'Resolve "A bug"' | 'Closes #123'
|
|
:internal | 'fix-issue' | 'Fix issue' | nil
|
|
:internal | '124-fix-issue' | '124 fix issue' | nil
|
|
end
|
|
|
|
with_them do
|
|
before do
|
|
if issue_tracker == :internal
|
|
issue.update!(iid: 123)
|
|
else
|
|
create(:"#{issue_tracker}_service", project: project)
|
|
end
|
|
end
|
|
|
|
it 'sets the correct title' do
|
|
expect(merge_request.title).to eq(title)
|
|
end
|
|
|
|
it 'sets the closing description' do
|
|
expect(merge_request.description).to eq(closing_message)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when the issue is not accessible to user' do
|
|
let(:source_branch) { "#{issue.iid}-fix-issue" }
|
|
|
|
before do
|
|
project.team.truncate
|
|
end
|
|
|
|
it 'uses branch title as the merge request title' do
|
|
expect(merge_request.title).to eq("#{issue.iid} fix issue")
|
|
end
|
|
|
|
it 'does not set a description' do
|
|
expect(merge_request.description).to be_nil
|
|
end
|
|
end
|
|
|
|
context 'when the issue is confidential' do
|
|
let(:source_branch) { "#{issue.iid}-fix-issue" }
|
|
let(:issue_confidential) { true }
|
|
|
|
it 'uses the title of the branch as the merge request title' do
|
|
expect(merge_request.title).to eq("#{issue.iid} fix issue")
|
|
end
|
|
|
|
it 'does not set a description' do
|
|
expect(merge_request.description).to be_nil
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'source branch does not exist' do
|
|
before do
|
|
allow(project).to receive(:commit).with(source_branch).and_return(nil)
|
|
allow(project).to receive(:commit).with(target_branch).and_return(commit_1)
|
|
end
|
|
|
|
it 'forbids the merge request from being created' do
|
|
expect(merge_request.can_be_created).to eq(false)
|
|
end
|
|
|
|
it 'adds an error message to the merge request' do
|
|
expect(merge_request.errors).to contain_exactly('Source branch "feature-branch" does not exist')
|
|
end
|
|
end
|
|
|
|
context 'target branch does not exist' do
|
|
before do
|
|
allow(project).to receive(:commit).with(source_branch).and_return(commit_1)
|
|
allow(project).to receive(:commit).with(target_branch).and_return(nil)
|
|
end
|
|
|
|
it 'forbids the merge request from being created' do
|
|
expect(merge_request.can_be_created).to eq(false)
|
|
end
|
|
|
|
it 'adds an error message to the merge request' do
|
|
expect(merge_request.errors).to contain_exactly('Target branch "master" does not exist')
|
|
end
|
|
end
|
|
|
|
context 'both source and target branches do not exist' do
|
|
before do
|
|
allow(project).to receive(:commit).and_return(nil)
|
|
end
|
|
|
|
it 'forbids the merge request from being created' do
|
|
expect(merge_request.can_be_created).to eq(false)
|
|
end
|
|
|
|
it 'adds both error messages to the merge request' do
|
|
expect(merge_request.errors).to contain_exactly(
|
|
'Source branch "feature-branch" does not exist',
|
|
'Target branch "master" does not exist'
|
|
)
|
|
end
|
|
end
|
|
|
|
context 'upstream project has disabled merge requests' do
|
|
let(:upstream_project) { create(:project, :merge_requests_disabled) }
|
|
let(:project) { create(:project, forked_from_project: upstream_project) }
|
|
let(:commits) { Commit.decorate([commit_1], project) }
|
|
|
|
it 'sets target project correctly' do
|
|
expect(merge_request.target_project).to eq(project)
|
|
end
|
|
end
|
|
|
|
context 'target_project is set and accessible by current_user' do
|
|
let(:target_project) { create(:project, :public, :repository)}
|
|
let(:commits) { Commit.decorate([commit_1], project) }
|
|
|
|
it 'sets target project correctly' do
|
|
expect(merge_request.target_project).to eq(target_project)
|
|
end
|
|
end
|
|
|
|
context 'target_project is set but not accessible by current_user' do
|
|
let(:target_project) { create(:project, :private, :repository)}
|
|
let(:commits) { Commit.decorate([commit_1], project) }
|
|
|
|
it 'sets target project correctly' do
|
|
expect(merge_request.target_project).to eq(project)
|
|
end
|
|
end
|
|
|
|
context 'target_project is set but repo is not accessible by current_user' do
|
|
let(:target_project) do
|
|
create(:project, :public, :repository, repository_access_level: ProjectFeature::PRIVATE)
|
|
end
|
|
|
|
it 'sets target project correctly' do
|
|
expect(merge_request.target_project).to eq(project)
|
|
end
|
|
end
|
|
|
|
context 'source_project is set and accessible by current_user' do
|
|
let(:source_project) { create(:project, :public, :repository)}
|
|
let(:commits) { Commit.decorate([commit_1], project) }
|
|
|
|
before do
|
|
# To create merge requests _from_ a project the user needs at least
|
|
# developer access
|
|
source_project.add_developer(user)
|
|
end
|
|
|
|
it 'sets source project correctly' do
|
|
expect(merge_request.source_project).to eq(source_project)
|
|
end
|
|
end
|
|
|
|
context 'source_project is set but not accessible by current_user' do
|
|
let(:source_project) { create(:project, :private, :repository)}
|
|
let(:commits) { Commit.decorate([commit_1], project) }
|
|
|
|
it 'sets source project correctly' do
|
|
expect(merge_request.source_project).to eq(project)
|
|
end
|
|
end
|
|
|
|
context 'source_project is set but the user cannot create merge requests from the project' do
|
|
let(:source_project) do
|
|
create(:project, :public, :repository, merge_requests_access_level: ProjectFeature::PRIVATE)
|
|
end
|
|
|
|
it 'sets the source_project correctly' do
|
|
expect(merge_request.source_project).to eq(project)
|
|
end
|
|
end
|
|
|
|
context 'target_project is not in the fork network of source_project' do
|
|
let(:target_project) { create(:project, :public, :repository) }
|
|
|
|
it 'adds an error to the merge request' do
|
|
expect(merge_request.errors[:validate_fork]).to contain_exactly('Source project is not a fork of the target project')
|
|
end
|
|
end
|
|
|
|
context 'target_project is in the fork network of source project but no longer accessible' do
|
|
let!(:project) { fork_project(target_project, user, namespace: user.namespace, repository: true) }
|
|
let(:source_project) { project }
|
|
let(:target_project) { create(:project, :public, :repository) }
|
|
|
|
before do
|
|
target_project.update(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
|
|
end
|
|
|
|
it 'sets the target_project correctly' do
|
|
expect(merge_request.target_project).to eq(project)
|
|
end
|
|
end
|
|
|
|
context 'when specifying target branch in the description' do
|
|
let(:description) { "A merge request targeting another branch\n\n/target_branch with-codeowners" }
|
|
|
|
it 'sets the attribute from the quick actions' do
|
|
expect(merge_request.target_branch).to eq('with-codeowners')
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when assigning labels' do
|
|
let(:label_ids) { [create(:label, project: project).id] }
|
|
|
|
context 'for members with less than developer access' do
|
|
it 'is not allowed' do
|
|
expect(merge_request.label_ids).to be_empty
|
|
end
|
|
end
|
|
|
|
context 'for users allowed to assign labels' do
|
|
before do
|
|
project.add_developer(user)
|
|
end
|
|
|
|
context 'for labels in the project' do
|
|
it 'is allowed for developers' do
|
|
expect(merge_request.label_ids).to contain_exactly(*label_ids)
|
|
end
|
|
end
|
|
|
|
context 'for unrelated labels' do
|
|
let(:project_label) { create(:label, project: project) }
|
|
let(:label_ids) { [create(:label).id, project_label.id] }
|
|
|
|
it 'only assigns related labels' do
|
|
expect(merge_request.label_ids).to contain_exactly(project_label.id)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|