2011-11-28 02:39:43 -05:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2015-12-09 04:50:51 -05:00
|
|
|
describe MergeRequest, models: true do
|
2016-07-01 17:53:46 -04:00
|
|
|
include RepoHelpers
|
|
|
|
|
2015-05-02 23:11:21 -04:00
|
|
|
subject { create(:merge_request) }
|
|
|
|
|
2015-05-02 23:14:31 -04:00
|
|
|
describe 'associations' do
|
2016-10-18 17:20:36 -04:00
|
|
|
it { is_expected.to belong_to(:target_project).class_name('Project') }
|
|
|
|
it { is_expected.to belong_to(:source_project).class_name('Project') }
|
2015-11-18 05:17:41 -05:00
|
|
|
it { is_expected.to belong_to(:merge_user).class_name("User") }
|
2017-05-04 08:11:15 -04:00
|
|
|
it { is_expected.to belong_to(:assignee) }
|
2016-07-25 11:42:57 -04:00
|
|
|
it { is_expected.to have_many(:merge_request_diffs).dependent(:destroy) }
|
2015-05-02 23:14:31 -04:00
|
|
|
end
|
|
|
|
|
2015-05-02 23:11:21 -04:00
|
|
|
describe 'modules' do
|
|
|
|
subject { described_class }
|
|
|
|
|
|
|
|
it { is_expected.to include_module(InternalId) }
|
|
|
|
it { is_expected.to include_module(Issuable) }
|
|
|
|
it { is_expected.to include_module(Referable) }
|
|
|
|
it { is_expected.to include_module(Sortable) }
|
|
|
|
it { is_expected.to include_module(Taskable) }
|
|
|
|
end
|
|
|
|
|
2016-02-26 03:55:43 -05:00
|
|
|
describe "act_as_paranoid" do
|
|
|
|
it { is_expected.to have_db_column(:deleted_at) }
|
|
|
|
it { is_expected.to have_db_index(:deleted_at) }
|
|
|
|
end
|
|
|
|
|
2015-05-02 23:11:21 -04:00
|
|
|
describe 'validation' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { is_expected.to validate_presence_of(:target_branch) }
|
|
|
|
it { is_expected.to validate_presence_of(:source_branch) }
|
2015-12-03 04:27:34 -05:00
|
|
|
|
2016-11-21 05:27:28 -05:00
|
|
|
context "Validation of merge user with Merge When Pipeline Succeeds" do
|
2015-12-03 04:27:34 -05:00
|
|
|
it "allows user to be nil when the feature is disabled" do
|
|
|
|
expect(subject).to be_valid
|
|
|
|
end
|
|
|
|
|
|
|
|
it "is invalid without merge user" do
|
2017-02-17 08:56:13 -05:00
|
|
|
subject.merge_when_pipeline_succeeds = true
|
2015-12-03 04:27:34 -05:00
|
|
|
expect(subject).not_to be_valid
|
|
|
|
end
|
|
|
|
|
|
|
|
it "is valid with merge user" do
|
2017-02-17 08:56:13 -05:00
|
|
|
subject.merge_when_pipeline_succeeds = true
|
2015-12-03 04:27:34 -05:00
|
|
|
subject.merge_user = build(:user)
|
|
|
|
|
|
|
|
expect(subject).to be_valid
|
|
|
|
end
|
|
|
|
end
|
2011-11-28 16:24:08 -05:00
|
|
|
end
|
|
|
|
|
2015-05-02 23:14:31 -04:00
|
|
|
describe 'respond to' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { is_expected.to respond_to(:unchecked?) }
|
|
|
|
it { is_expected.to respond_to(:can_be_merged?) }
|
|
|
|
it { is_expected.to respond_to(:cannot_be_merged?) }
|
2015-11-18 05:17:41 -05:00
|
|
|
it { is_expected.to respond_to(:merge_params) }
|
2017-02-17 08:56:13 -05:00
|
|
|
it { is_expected.to respond_to(:merge_when_pipeline_succeeds) }
|
2013-02-20 08:15:01 -05:00
|
|
|
end
|
2013-03-20 17:46:30 -04:00
|
|
|
|
2016-03-07 06:56:46 -05:00
|
|
|
describe '.in_projects' do
|
|
|
|
it 'returns the merge requests for a set of projects' do
|
|
|
|
expect(described_class.in_projects(Project.all)).to eq([subject])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-20 12:48:04 -04:00
|
|
|
describe '#target_branch_sha' do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:project, :repository) }
|
2016-04-26 18:57:37 -04:00
|
|
|
|
2016-07-29 17:24:11 -04:00
|
|
|
subject { create(:merge_request, source_project: project, target_project: project) }
|
2016-04-26 18:57:37 -04:00
|
|
|
|
2016-07-29 17:24:11 -04:00
|
|
|
context 'when the target branch does not exist' do
|
2016-04-26 18:57:37 -04:00
|
|
|
before do
|
|
|
|
project.repository.raw_repository.delete_branch(subject.target_branch)
|
|
|
|
end
|
2016-03-18 13:16:04 -04:00
|
|
|
|
|
|
|
it 'returns nil' do
|
2016-06-20 12:48:04 -04:00
|
|
|
expect(subject.target_branch_sha).to be_nil
|
2016-03-18 13:16:04 -04:00
|
|
|
end
|
|
|
|
end
|
2016-07-29 17:24:11 -04:00
|
|
|
|
|
|
|
it 'returns memoized value' do
|
|
|
|
subject.target_branch_sha = '8ffb3c15a5475e59ae909384297fede4badcb4c7'
|
|
|
|
|
|
|
|
expect(subject.target_branch_sha).to eq '8ffb3c15a5475e59ae909384297fede4badcb4c7'
|
|
|
|
end
|
2016-03-18 13:16:04 -04:00
|
|
|
end
|
|
|
|
|
2017-05-04 08:11:15 -04:00
|
|
|
describe '#card_attributes' do
|
|
|
|
it 'includes the author name' do
|
|
|
|
allow(subject).to receive(:author).and_return(double(name: 'Robert'))
|
|
|
|
allow(subject).to receive(:assignee).and_return(nil)
|
|
|
|
|
|
|
|
expect(subject.card_attributes).
|
|
|
|
to eq({ 'Author' => 'Robert', 'Assignee' => nil })
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'includes the assignee name' do
|
|
|
|
allow(subject).to receive(:author).and_return(double(name: 'Robert'))
|
|
|
|
allow(subject).to receive(:assignee).and_return(double(name: 'Douwe'))
|
|
|
|
|
|
|
|
expect(subject.card_attributes).
|
|
|
|
to eq({ 'Author' => 'Robert', 'Assignee' => 'Douwe' })
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#assignee_or_author?' do
|
|
|
|
let(:user) { create(:user) }
|
|
|
|
|
|
|
|
it 'returns true for a user that is assigned to a merge request' do
|
|
|
|
subject.assignee = user
|
|
|
|
|
|
|
|
expect(subject.assignee_or_author?(user)).to eq(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true for a user that is the author of a merge request' do
|
|
|
|
subject.author = user
|
|
|
|
|
|
|
|
expect(subject.assignee_or_author?(user)).to eq(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false for a user that is not the assignee or author' do
|
|
|
|
expect(subject.assignee_or_author?(user)).to eq(false)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-09-30 10:53:44 -04:00
|
|
|
describe '#cache_merge_request_closes_issues!' do
|
|
|
|
before do
|
|
|
|
subject.project.team << [subject.author, :developer]
|
|
|
|
subject.target_branch = subject.project.default_branch
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'caches closed issues' do
|
|
|
|
issue = create :issue, project: subject.project
|
|
|
|
commit = double('commit1', safe_message: "Fixes #{issue.to_reference}")
|
|
|
|
allow(subject).to receive(:commits).and_return([commit])
|
|
|
|
|
2017-01-31 09:42:54 -05:00
|
|
|
expect { subject.cache_merge_request_closes_issues!(subject.author) }.to change(subject.merge_requests_closing_issues, :count).by(1)
|
2016-09-30 10:53:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not cache issues from external trackers' do
|
|
|
|
subject.project.update_attribute(:has_external_issue_tracker, true)
|
|
|
|
issue = ExternalIssue.new('JIRA-123', subject.project)
|
|
|
|
commit = double('commit1', safe_message: "Fixes #{issue.to_reference}")
|
|
|
|
allow(subject).to receive(:commits).and_return([commit])
|
|
|
|
|
2017-01-31 09:42:54 -05:00
|
|
|
expect { subject.cache_merge_request_closes_issues!(subject.author) }.not_to change(subject.merge_requests_closing_issues, :count)
|
2016-09-30 10:53:44 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-20 12:48:04 -04:00
|
|
|
describe '#source_branch_sha' do
|
2016-03-09 01:51:52 -05:00
|
|
|
let(:last_branch_commit) { subject.source_project.repository.commit(subject.source_branch) }
|
|
|
|
|
|
|
|
context 'with diffs' do
|
|
|
|
subject { create(:merge_request, :with_diffs) }
|
|
|
|
it 'returns the sha of the source branch last commit' do
|
2016-06-20 12:48:04 -04:00
|
|
|
expect(subject.source_branch_sha).to eq(last_branch_commit.sha)
|
2016-03-09 01:51:52 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-03-09 02:19:54 -05:00
|
|
|
context 'without diffs' do
|
|
|
|
subject { create(:merge_request, :without_diffs) }
|
|
|
|
it 'returns the sha of the source branch last commit' do
|
2016-06-20 12:48:04 -04:00
|
|
|
expect(subject.source_branch_sha).to eq(last_branch_commit.sha)
|
2016-03-09 02:19:54 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-03-09 01:51:52 -05:00
|
|
|
context 'when the merge request is being created' do
|
|
|
|
subject { build(:merge_request, source_branch: nil, compare_commits: []) }
|
|
|
|
it 'returns nil' do
|
2016-06-20 12:48:04 -04:00
|
|
|
expect(subject.source_branch_sha).to be_nil
|
2016-03-09 01:51:52 -05:00
|
|
|
end
|
|
|
|
end
|
2016-07-29 17:24:11 -04:00
|
|
|
|
|
|
|
it 'returns memoized value' do
|
|
|
|
subject.source_branch_sha = '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
|
|
|
|
|
|
|
|
expect(subject.source_branch_sha).to eq '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
|
|
|
|
end
|
2016-03-09 01:51:52 -05:00
|
|
|
end
|
|
|
|
|
2015-05-02 23:11:21 -04:00
|
|
|
describe '#to_reference' do
|
2016-11-02 19:49:13 -04:00
|
|
|
let(:project) { build(:empty_project, name: 'sample-project') }
|
|
|
|
let(:merge_request) { build(:merge_request, target_project: project, iid: 1) }
|
|
|
|
|
2015-05-02 23:11:21 -04:00
|
|
|
it 'returns a String reference to the object' do
|
2016-11-02 19:49:13 -04:00
|
|
|
expect(merge_request.to_reference).to eq "!1"
|
2015-05-02 23:11:21 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'supports a cross-project reference' do
|
2017-01-19 16:57:15 -05:00
|
|
|
another_project = build(:empty_project, name: 'another-project', namespace: project.namespace)
|
2016-11-02 19:49:13 -04:00
|
|
|
expect(merge_request.to_reference(another_project)).to eq "sample-project!1"
|
2015-05-02 23:11:21 -04:00
|
|
|
end
|
2016-12-21 11:41:33 -05:00
|
|
|
|
|
|
|
it 'returns a String reference with the full path' do
|
|
|
|
expect(merge_request.to_reference(full: true)).to eq(project.path_with_namespace + '!1')
|
|
|
|
end
|
2012-08-09 13:45:12 -04:00
|
|
|
end
|
2012-10-04 18:25:40 -04:00
|
|
|
|
2016-07-27 13:00:34 -04:00
|
|
|
describe '#raw_diffs' do
|
2016-06-28 12:25:32 -04:00
|
|
|
let(:merge_request) { build(:merge_request) }
|
|
|
|
let(:options) { { paths: ['a/b', 'b/a', 'c/*'] } }
|
|
|
|
|
|
|
|
context 'when there are MR diffs' do
|
|
|
|
it 'delegates to the MR diffs' do
|
|
|
|
merge_request.merge_request_diff = MergeRequestDiff.new
|
|
|
|
|
2016-08-03 17:32:12 -04:00
|
|
|
expect(merge_request.merge_request_diff).to receive(:raw_diffs).with(options)
|
2016-06-28 12:25:32 -04:00
|
|
|
|
2016-07-27 13:00:34 -04:00
|
|
|
merge_request.raw_diffs(options)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when there are no MR diffs' do
|
|
|
|
it 'delegates to the compare object' do
|
|
|
|
merge_request.compare = double(:compare)
|
|
|
|
|
|
|
|
expect(merge_request.compare).to receive(:raw_diffs).with(options)
|
|
|
|
|
|
|
|
merge_request.raw_diffs(options)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
describe '#diffs' do
|
|
|
|
let(:merge_request) { build(:merge_request) }
|
|
|
|
let(:options) { { paths: ['a/b', 'b/a', 'c/*'] } }
|
|
|
|
|
|
|
|
context 'when there are MR diffs' do
|
|
|
|
it 'delegates to the MR diffs' do
|
2016-08-15 11:22:26 -04:00
|
|
|
merge_request.save
|
2016-06-28 12:25:32 -04:00
|
|
|
|
2016-08-03 17:32:12 -04:00
|
|
|
expect(merge_request.merge_request_diff).to receive(:raw_diffs).with(hash_including(options))
|
2016-06-28 12:25:32 -04:00
|
|
|
|
|
|
|
merge_request.diffs(options)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when there are no MR diffs' do
|
2017-04-20 10:47:32 -04:00
|
|
|
it 'delegates to the compare object, setting no_collapse: true' do
|
2016-06-28 12:25:32 -04:00
|
|
|
merge_request.compare = double(:compare)
|
|
|
|
|
2017-04-20 10:47:32 -04:00
|
|
|
expect(merge_request.compare).to receive(:diffs).with(options.merge(no_collapse: true))
|
2016-06-28 12:25:32 -04:00
|
|
|
|
|
|
|
merge_request.diffs(options)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-02-09 07:29:56 -05:00
|
|
|
describe '#diff_size' do
|
|
|
|
let(:merge_request) do
|
|
|
|
build(:merge_request, source_branch: 'expand-collapse-files', target_branch: 'master')
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when there are MR diffs' do
|
2017-04-20 10:47:32 -04:00
|
|
|
it 'returns the correct count' do
|
2017-02-09 07:29:56 -05:00
|
|
|
merge_request.save
|
2017-04-20 10:47:32 -04:00
|
|
|
|
|
|
|
expect(merge_request.diff_size).to eq('105')
|
2017-02-09 07:29:56 -05:00
|
|
|
end
|
|
|
|
|
2017-04-20 10:47:32 -04:00
|
|
|
it 'returns the correct overflow count' do
|
|
|
|
allow(Commit).to receive(:max_diff_options).and_return(max_files: 2)
|
|
|
|
merge_request.save
|
|
|
|
|
|
|
|
expect(merge_request.diff_size).to eq('2+')
|
2017-02-09 07:29:56 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not perform highlighting' do
|
2017-04-20 10:47:32 -04:00
|
|
|
merge_request.save
|
|
|
|
|
2017-02-09 07:29:56 -05:00
|
|
|
expect(Gitlab::Diff::Highlight).not_to receive(:new)
|
|
|
|
|
|
|
|
merge_request.diff_size
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when there are no MR diffs' do
|
2017-04-20 10:47:32 -04:00
|
|
|
def set_compare(merge_request)
|
2017-02-09 07:29:56 -05:00
|
|
|
merge_request.compare = CompareService.new(
|
|
|
|
merge_request.source_project,
|
|
|
|
merge_request.source_branch
|
|
|
|
).execute(
|
|
|
|
merge_request.target_project,
|
|
|
|
merge_request.target_branch
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns the correct count' do
|
2017-04-20 10:47:32 -04:00
|
|
|
set_compare(merge_request)
|
|
|
|
|
|
|
|
expect(merge_request.diff_size).to eq('105')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns the correct overflow count' do
|
|
|
|
allow(Commit).to receive(:max_diff_options).and_return(max_files: 2)
|
|
|
|
set_compare(merge_request)
|
|
|
|
|
|
|
|
expect(merge_request.diff_size).to eq('2+')
|
2017-02-09 07:29:56 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not perform highlighting' do
|
2017-04-20 10:47:32 -04:00
|
|
|
set_compare(merge_request)
|
|
|
|
|
2017-02-09 07:29:56 -05:00
|
|
|
expect(Gitlab::Diff::Highlight).not_to receive(:new)
|
|
|
|
|
|
|
|
merge_request.diff_size
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-12-08 20:56:31 -05:00
|
|
|
describe "#related_notes" do
|
2012-11-05 22:31:55 -05:00
|
|
|
let!(:merge_request) { create(:merge_request) }
|
2012-10-04 18:25:40 -04:00
|
|
|
|
|
|
|
before do
|
2015-02-12 13:17:35 -05:00
|
|
|
allow(merge_request).to receive(:commits) { [merge_request.source_project.repository.commit] }
|
2016-04-26 07:52:18 -04:00
|
|
|
create(:note_on_commit, commit_id: merge_request.commits.first.id,
|
|
|
|
project: merge_request.project)
|
2013-10-07 12:42:59 -04:00
|
|
|
create(:note, noteable: merge_request, project: merge_request.project)
|
2012-10-04 18:25:40 -04:00
|
|
|
end
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "includes notes for commits" do
|
2015-02-12 13:17:35 -05:00
|
|
|
expect(merge_request.commits).not_to be_empty
|
2016-12-08 20:56:31 -05:00
|
|
|
expect(merge_request.related_notes.count).to eq(2)
|
2012-10-04 18:25:40 -04:00
|
|
|
end
|
2015-10-22 12:38:00 -04:00
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "includes notes for commits from target project as well" do
|
2016-04-26 07:52:18 -04:00
|
|
|
create(:note_on_commit, commit_id: merge_request.commits.first.id,
|
|
|
|
project: merge_request.target_project)
|
|
|
|
|
2015-10-22 12:38:00 -04:00
|
|
|
expect(merge_request.commits).not_to be_empty
|
2016-12-08 20:56:31 -05:00
|
|
|
expect(merge_request.related_notes.count).to eq(3)
|
2015-10-22 12:38:00 -04:00
|
|
|
end
|
2012-10-04 18:25:40 -04:00
|
|
|
end
|
2012-10-09 18:25:29 -04:00
|
|
|
|
2013-04-25 10:15:33 -04:00
|
|
|
describe '#for_fork?' do
|
|
|
|
it 'returns true if the merge request is for a fork' do
|
2017-01-19 16:57:15 -05:00
|
|
|
subject.source_project = build_stubbed(:empty_project, namespace: create(:group))
|
|
|
|
subject.target_project = build_stubbed(:empty_project, namespace: create(:group))
|
2013-04-25 10:15:33 -04:00
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
expect(subject.for_fork?).to be_truthy
|
2013-04-25 10:15:33 -04:00
|
|
|
end
|
2014-01-23 06:24:25 -05:00
|
|
|
|
2013-04-25 10:15:33 -04:00
|
|
|
it 'returns false if is not for a fork' do
|
2015-02-12 13:17:35 -05:00
|
|
|
expect(subject.for_fork?).to be_falsey
|
2013-04-25 10:15:33 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-11-28 04:02:37 -05:00
|
|
|
describe '#closes_issues' do
|
2013-05-30 19:16:49 -04:00
|
|
|
let(:issue0) { create :issue, project: subject.project }
|
|
|
|
let(:issue1) { create :issue, project: subject.project }
|
2016-01-27 08:09:58 -05:00
|
|
|
|
|
|
|
let(:commit0) { double('commit0', safe_message: "Fixes #{issue0.to_reference}") }
|
|
|
|
let(:commit1) { double('commit1', safe_message: "Fixes #{issue0.to_reference}") }
|
|
|
|
let(:commit2) { double('commit2', safe_message: "Fixes #{issue1.to_reference}") }
|
2013-05-30 19:16:49 -04:00
|
|
|
|
|
|
|
before do
|
2016-03-17 16:39:50 -04:00
|
|
|
subject.project.team << [subject.author, :developer]
|
2015-05-21 17:49:06 -04:00
|
|
|
allow(subject).to receive(:commits).and_return([commit0, commit1, commit2])
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
|
|
|
|
2016-11-28 04:02:37 -05:00
|
|
|
it 'accesses the set of issues that will be closed on acceptance' do
|
|
|
|
allow(subject.project).to receive(:default_branch).
|
|
|
|
and_return(subject.target_branch)
|
2016-11-23 16:50:49 -05:00
|
|
|
|
2016-11-28 04:02:37 -05:00
|
|
|
closed = subject.closes_issues
|
2016-11-23 16:50:49 -05:00
|
|
|
|
2016-11-28 04:02:37 -05:00
|
|
|
expect(closed).to include(issue0, issue1)
|
|
|
|
end
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2016-11-28 04:02:37 -05:00
|
|
|
it 'only lists issues as to be closed if it targets the default branch' do
|
|
|
|
allow(subject.project).to receive(:default_branch).and_return('master')
|
|
|
|
subject.target_branch = 'something-else'
|
2013-05-30 19:16:49 -04:00
|
|
|
|
2016-11-28 04:02:37 -05:00
|
|
|
expect(subject.closes_issues).to be_empty
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
2016-11-28 04:02:37 -05:00
|
|
|
end
|
2014-06-13 10:19:08 -04:00
|
|
|
|
2016-11-28 04:02:37 -05:00
|
|
|
describe '#issues_mentioned_but_not_closing' do
|
2016-12-28 08:22:31 -05:00
|
|
|
let(:closing_issue) { create :issue, project: subject.project }
|
|
|
|
let(:mentioned_issue) { create :issue, project: subject.project }
|
|
|
|
|
|
|
|
let(:commit) { double('commit', safe_message: "Fixes #{closing_issue.to_reference}") }
|
2016-11-23 16:50:49 -05:00
|
|
|
|
2016-12-28 08:22:31 -05:00
|
|
|
it 'detects issues mentioned in description but not closed' do
|
2016-11-28 04:02:37 -05:00
|
|
|
subject.project.team << [subject.author, :developer]
|
2016-12-28 08:22:31 -05:00
|
|
|
subject.description = "Is related to #{mentioned_issue.to_reference} and #{closing_issue.to_reference}"
|
2016-11-23 16:50:49 -05:00
|
|
|
|
2016-12-28 08:22:31 -05:00
|
|
|
allow(subject).to receive(:commits).and_return([commit])
|
2015-05-21 17:49:06 -04:00
|
|
|
allow(subject.project).to receive(:default_branch).
|
|
|
|
and_return(subject.target_branch)
|
2014-06-13 10:19:08 -04:00
|
|
|
|
2017-01-31 09:42:54 -05:00
|
|
|
expect(subject.issues_mentioned_but_not_closing(subject.author)).to match_array([mentioned_issue])
|
2014-06-13 10:19:08 -04:00
|
|
|
end
|
2017-03-03 09:25:52 -05:00
|
|
|
|
|
|
|
context 'when the project has an external issue tracker' do
|
|
|
|
before do
|
|
|
|
subject.project.team << [subject.author, :developer]
|
|
|
|
commit = double(:commit, safe_message: 'Fixes TEST-3')
|
|
|
|
|
|
|
|
create(:jira_service, project: subject.project)
|
|
|
|
|
|
|
|
allow(subject).to receive(:commits).and_return([commit])
|
|
|
|
allow(subject).to receive(:description).and_return('Is related to TEST-2 and TEST-3')
|
|
|
|
allow(subject.project).to receive(:default_branch).and_return(subject.target_branch)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'detects issues mentioned in description but not closed' do
|
|
|
|
expect(subject.issues_mentioned_but_not_closing(subject.author).map(&:to_s)).to match_array(['TEST-2'])
|
|
|
|
end
|
|
|
|
end
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
|
|
|
|
2015-04-30 09:43:32 -04:00
|
|
|
describe "#work_in_progress?" do
|
2016-03-18 18:27:35 -04:00
|
|
|
['WIP ', 'WIP:', 'WIP: ', '[WIP]', '[WIP] ', ' [WIP] WIP [WIP] WIP: WIP '].each do |wip_prefix|
|
|
|
|
it "detects the '#{wip_prefix}' prefix" do
|
|
|
|
subject.title = "#{wip_prefix}#{subject.title}"
|
2016-03-28 19:41:00 -04:00
|
|
|
expect(subject.work_in_progress?).to eq true
|
2016-03-18 18:27:35 -04:00
|
|
|
end
|
2015-11-23 13:36:47 -05:00
|
|
|
end
|
|
|
|
|
2015-04-30 09:43:32 -04:00
|
|
|
it "doesn't detect WIP for words starting with WIP" do
|
|
|
|
subject.title = "Wipwap #{subject.title}"
|
2016-03-28 19:41:00 -04:00
|
|
|
expect(subject.work_in_progress?).to eq false
|
2015-04-30 09:43:32 -04:00
|
|
|
end
|
|
|
|
|
2016-03-18 18:27:35 -04:00
|
|
|
it "doesn't detect WIP for words containing with WIP" do
|
|
|
|
subject.title = "WupWipwap #{subject.title}"
|
2016-03-28 19:41:00 -04:00
|
|
|
expect(subject.work_in_progress?).to eq false
|
2016-03-18 18:27:35 -04:00
|
|
|
end
|
|
|
|
|
2015-04-30 09:43:32 -04:00
|
|
|
it "doesn't detect WIP by default" do
|
2016-03-28 19:41:00 -04:00
|
|
|
expect(subject.work_in_progress?).to eq false
|
2015-04-30 09:43:32 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-09-08 05:18:41 -04:00
|
|
|
describe "#wipless_title" do
|
|
|
|
['WIP ', 'WIP:', 'WIP: ', '[WIP]', '[WIP] ', ' [WIP] WIP [WIP] WIP: WIP '].each do |wip_prefix|
|
|
|
|
it "removes the '#{wip_prefix}' prefix" do
|
|
|
|
wipless_title = subject.title
|
|
|
|
subject.title = "#{wip_prefix}#{subject.title}"
|
|
|
|
|
|
|
|
expect(subject.wipless_title).to eq wipless_title
|
|
|
|
end
|
|
|
|
|
|
|
|
it "is satisfies the #work_in_progress? method" do
|
|
|
|
subject.title = "#{wip_prefix}#{subject.title}"
|
|
|
|
subject.title = subject.wipless_title
|
|
|
|
|
|
|
|
expect(subject.work_in_progress?).to eq false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "#wip_title" do
|
|
|
|
it "adds the WIP: prefix to the title" do
|
|
|
|
wip_title = "WIP: #{subject.title}"
|
|
|
|
|
|
|
|
expect(subject.wip_title).to eq wip_title
|
2016-10-14 07:13:11 -04:00
|
|
|
end
|
2016-09-08 05:18:41 -04:00
|
|
|
|
|
|
|
it "does not add the WIP: prefix multiple times" do
|
|
|
|
wip_title = "WIP: #{subject.title}"
|
|
|
|
subject.title = subject.wip_title
|
|
|
|
subject.title = subject.wip_title
|
|
|
|
|
|
|
|
expect(subject.wip_title).to eq wip_title
|
|
|
|
end
|
|
|
|
|
|
|
|
it "is satisfies the #work_in_progress? method" do
|
|
|
|
subject.title = subject.wip_title
|
|
|
|
|
|
|
|
expect(subject.work_in_progress?).to eq true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-12-07 03:59:04 -05:00
|
|
|
describe '#can_remove_source_branch?' do
|
2015-12-03 04:27:34 -05:00
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:user2) { create(:user) }
|
2015-11-24 08:59:02 -05:00
|
|
|
|
|
|
|
before do
|
|
|
|
subject.source_project.team << [user, :master]
|
|
|
|
|
2015-12-03 04:27:34 -05:00
|
|
|
subject.source_branch = "feature"
|
|
|
|
subject.target_branch = "master"
|
|
|
|
subject.save!
|
|
|
|
end
|
2015-11-24 08:59:02 -05:00
|
|
|
|
2015-12-03 04:27:34 -05:00
|
|
|
it "can't be removed when its a protected branch" do
|
2017-04-03 13:59:58 -04:00
|
|
|
allow(ProtectedBranch).to receive(:protected?).and_return(true)
|
2015-11-24 08:59:02 -05:00
|
|
|
expect(subject.can_remove_source_branch?(user)).to be_falsey
|
|
|
|
end
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "can't remove a root ref" do
|
2015-12-03 04:27:34 -05:00
|
|
|
subject.source_branch = "master"
|
|
|
|
subject.target_branch = "feature"
|
2015-11-24 08:59:02 -05:00
|
|
|
|
|
|
|
expect(subject.can_remove_source_branch?(user)).to be_falsey
|
|
|
|
end
|
|
|
|
|
2015-12-03 04:27:34 -05:00
|
|
|
it "is unable to remove the source branch for a project the user cannot push to" do
|
|
|
|
expect(subject.can_remove_source_branch?(user2)).to be_falsey
|
|
|
|
end
|
|
|
|
|
2016-02-04 05:51:12 -05:00
|
|
|
it "can be removed if the last commit is the head of the source branch" do
|
2016-07-28 11:41:57 -04:00
|
|
|
allow(subject).to receive(:source_branch_head).and_return(subject.diff_head_commit)
|
2016-02-04 05:51:12 -05:00
|
|
|
|
2015-12-03 04:27:34 -05:00
|
|
|
expect(subject.can_remove_source_branch?(user)).to be_truthy
|
2015-11-24 08:59:02 -05:00
|
|
|
end
|
2016-02-04 05:51:12 -05:00
|
|
|
|
|
|
|
it "cannot be removed if the last commit is not also the head of the source branch" do
|
2016-06-20 12:48:04 -04:00
|
|
|
subject.source_branch = "lfs"
|
|
|
|
|
2016-02-04 05:51:12 -05:00
|
|
|
expect(subject.can_remove_source_branch?(user)).to be_falsey
|
|
|
|
end
|
2015-11-24 08:59:02 -05:00
|
|
|
end
|
|
|
|
|
2016-09-21 10:22:54 -04:00
|
|
|
describe '#merge_commit_message' do
|
|
|
|
it 'includes merge information as the title' do
|
|
|
|
request = build(:merge_request, source_branch: 'source', target_branch: 'target')
|
|
|
|
|
|
|
|
expect(request.merge_commit_message)
|
|
|
|
.to match("Merge branch 'source' into 'target'\n\n")
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'includes its title in the body' do
|
|
|
|
request = build(:merge_request, title: 'Remove all technical debt')
|
|
|
|
|
|
|
|
expect(request.merge_commit_message)
|
|
|
|
.to match("Remove all technical debt\n\n")
|
|
|
|
end
|
|
|
|
|
2016-11-23 06:03:53 -05:00
|
|
|
it 'includes its closed issues in the body' do
|
2016-12-13 08:00:00 -05:00
|
|
|
issue = create(:issue, project: subject.project)
|
2016-09-21 10:22:54 -04:00
|
|
|
|
2016-11-23 06:03:53 -05:00
|
|
|
subject.project.team << [subject.author, :developer]
|
2016-12-13 08:00:00 -05:00
|
|
|
subject.description = "This issue Closes #{issue.to_reference}"
|
2016-11-23 06:03:53 -05:00
|
|
|
|
|
|
|
allow(subject.project).to receive(:default_branch).
|
|
|
|
and_return(subject.target_branch)
|
|
|
|
|
|
|
|
expect(subject.merge_commit_message)
|
2016-12-13 08:00:00 -05:00
|
|
|
.to match("Closes #{issue.to_reference}")
|
2016-09-21 10:22:54 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'includes its reference in the body' do
|
|
|
|
request = build_stubbed(:merge_request)
|
|
|
|
|
|
|
|
expect(request.merge_commit_message)
|
|
|
|
.to match("See merge request #{request.to_reference}")
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'excludes multiple linebreak runs when description is blank' do
|
|
|
|
request = build(:merge_request, title: 'Title', description: nil)
|
|
|
|
|
|
|
|
expect(request.merge_commit_message).not_to match("Title\n\n\n\n")
|
|
|
|
end
|
2016-11-28 04:48:55 -05:00
|
|
|
|
|
|
|
it 'includes its description in the body' do
|
|
|
|
request = build(:merge_request, description: 'By removing all code')
|
|
|
|
|
|
|
|
expect(request.merge_commit_message(include_description: true))
|
|
|
|
.to match("By removing all code\n\n")
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not includes its description in the body' do
|
|
|
|
request = build(:merge_request, description: 'By removing all code')
|
|
|
|
|
|
|
|
expect(request.merge_commit_message)
|
|
|
|
.not_to match("By removing all code\n\n")
|
|
|
|
end
|
2016-09-21 10:22:54 -04:00
|
|
|
end
|
|
|
|
|
2017-02-17 08:56:13 -05:00
|
|
|
describe "#reset_merge_when_pipeline_succeeds" do
|
2016-02-12 15:41:31 -05:00
|
|
|
let(:merge_if_green) do
|
2017-02-17 08:56:13 -05:00
|
|
|
create :merge_request, merge_when_pipeline_succeeds: true, merge_user: create(:user),
|
2016-02-12 15:41:31 -05:00
|
|
|
merge_params: { "should_remove_source_branch" => "1", "commit_message" => "msg" }
|
|
|
|
end
|
2015-12-03 04:27:34 -05:00
|
|
|
|
2015-11-18 05:17:41 -05:00
|
|
|
it "sets the item to false" do
|
2017-02-17 08:56:13 -05:00
|
|
|
merge_if_green.reset_merge_when_pipeline_succeeds
|
2015-11-18 05:17:41 -05:00
|
|
|
merge_if_green.reload
|
|
|
|
|
2017-02-17 08:56:13 -05:00
|
|
|
expect(merge_if_green.merge_when_pipeline_succeeds).to be_falsey
|
2016-02-12 15:41:31 -05:00
|
|
|
expect(merge_if_green.merge_params["should_remove_source_branch"]).to be_nil
|
|
|
|
expect(merge_if_green.merge_params["commit_message"]).to be_nil
|
2015-11-18 05:17:41 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-09-25 16:07:08 -04:00
|
|
|
describe "#hook_attrs" do
|
2017-03-14 12:56:15 -04:00
|
|
|
let(:attrs_hash) { subject.hook_attrs }
|
Add new data to project in push, issue, merge-request and note webhooks data
- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`,
`path_with_namespace` and `default_branch` in `project` in push, issue,
merge-request and note webhooks data
- Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in
favor of `git_http_url` in `project` for push, issue, merge-request and
note webhooks data
- Deprecate the `repository` key in push, issue, merge-request and
note webhooks data, use `project` instead
2016-02-06 09:20:21 -05:00
|
|
|
|
|
|
|
[:source, :target].each do |key|
|
|
|
|
describe "#{key} key" do
|
|
|
|
include_examples 'project hook data', project_key: key do
|
|
|
|
let(:data) { attrs_hash }
|
|
|
|
let(:project) { subject.send("#{key}_project") }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-09-25 16:07:08 -04:00
|
|
|
it "has all the required keys" do
|
Add new data to project in push, issue, merge-request and note webhooks data
- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`,
`path_with_namespace` and `default_branch` in `project` in push, issue,
merge-request and note webhooks data
- Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in
favor of `git_http_url` in `project` for push, issue, merge-request and
note webhooks data
- Deprecate the `repository` key in push, issue, merge-request and
note webhooks data, use `project` instead
2016-02-06 09:20:21 -05:00
|
|
|
expect(attrs_hash).to include(:source)
|
|
|
|
expect(attrs_hash).to include(:target)
|
|
|
|
expect(attrs_hash).to include(:last_commit)
|
|
|
|
expect(attrs_hash).to include(:work_in_progress)
|
2017-03-14 12:56:15 -04:00
|
|
|
expect(attrs_hash).to include(:total_time_spent)
|
|
|
|
expect(attrs_hash).to include(:human_time_estimate)
|
|
|
|
expect(attrs_hash).to include(:human_total_time_spent)
|
|
|
|
expect(attrs_hash).to include('time_estimate')
|
2015-09-25 16:07:08 -04:00
|
|
|
end
|
2016-02-04 13:23:58 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
describe '#diverged_commits_count' do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:project, :repository) }
|
|
|
|
let(:fork_project) { create(:project, :repository, forked_from_project: project) }
|
2016-02-04 13:23:58 -05:00
|
|
|
|
2016-03-18 13:16:04 -04:00
|
|
|
context 'when the target branch does not exist anymore' do
|
2016-04-26 18:57:37 -04:00
|
|
|
subject { create(:merge_request, source_project: project, target_project: project) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
project.repository.raw_repository.delete_branch(subject.target_branch)
|
|
|
|
subject.reload
|
|
|
|
end
|
2016-03-18 13:16:04 -04:00
|
|
|
|
|
|
|
it 'does not crash' do
|
|
|
|
expect{ subject.diverged_commits_count }.not_to raise_error
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns 0' do
|
|
|
|
expect(subject.diverged_commits_count).to eq(0)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-02-04 13:23:58 -05:00
|
|
|
context 'diverged on same repository' do
|
|
|
|
subject(:merge_request_with_divergence) { create(:merge_request, :diverged, source_project: project, target_project: project) }
|
|
|
|
|
|
|
|
it 'counts commits that are on target branch but not on source branch' do
|
2016-10-03 08:11:16 -04:00
|
|
|
expect(subject.diverged_commits_count).to eq(29)
|
2016-02-04 13:23:58 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'diverged on fork' do
|
|
|
|
subject(:merge_request_fork_with_divergence) { create(:merge_request, :diverged, source_project: fork_project, target_project: project) }
|
|
|
|
|
|
|
|
it 'counts commits that are on target branch but not on source branch' do
|
2016-10-03 08:11:16 -04:00
|
|
|
expect(subject.diverged_commits_count).to eq(29)
|
2016-02-04 13:23:58 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'rebased on fork' do
|
|
|
|
subject(:merge_request_rebased) { create(:merge_request, :rebased, source_project: fork_project, target_project: project) }
|
|
|
|
|
|
|
|
it 'counts commits that are on target branch but not on source branch' do
|
|
|
|
expect(subject.diverged_commits_count).to eq(0)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'caching' do
|
|
|
|
before(:example) do
|
|
|
|
allow(Rails).to receive(:cache).and_return(ActiveSupport::Cache::MemoryStore.new)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'caches the output' do
|
|
|
|
expect(subject).to receive(:compute_diverged_commits_count).
|
|
|
|
once.
|
|
|
|
and_return(2)
|
|
|
|
|
|
|
|
subject.diverged_commits_count
|
|
|
|
subject.diverged_commits_count
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'invalidates the cache when the source sha changes' do
|
|
|
|
expect(subject).to receive(:compute_diverged_commits_count).
|
|
|
|
twice.
|
|
|
|
and_return(2)
|
|
|
|
|
|
|
|
subject.diverged_commits_count
|
2016-06-20 12:48:04 -04:00
|
|
|
allow(subject).to receive(:source_branch_sha).and_return('123abc')
|
2016-02-04 13:23:58 -05:00
|
|
|
subject.diverged_commits_count
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'invalidates the cache when the target sha changes' do
|
|
|
|
expect(subject).to receive(:compute_diverged_commits_count).
|
|
|
|
twice.
|
|
|
|
and_return(2)
|
|
|
|
|
|
|
|
subject.diverged_commits_count
|
2016-06-20 12:48:04 -04:00
|
|
|
allow(subject).to receive(:target_branch_sha).and_return('123abc')
|
2016-02-04 13:23:58 -05:00
|
|
|
subject.diverged_commits_count
|
|
|
|
end
|
|
|
|
end
|
2015-09-25 16:07:08 -04:00
|
|
|
end
|
|
|
|
|
2013-05-30 19:16:49 -04:00
|
|
|
it_behaves_like 'an editable mentionable' do
|
2016-09-29 10:28:45 -04:00
|
|
|
subject { create(:merge_request, :simple) }
|
2015-04-16 16:25:25 -04:00
|
|
|
|
2015-06-17 20:40:26 -04:00
|
|
|
let(:backref_text) { "merge request #{subject.to_reference}" }
|
|
|
|
let(:set_mentionable_text) { ->(txt){ subject.description = txt } }
|
2013-05-30 19:16:49 -04:00
|
|
|
end
|
2014-10-05 22:17:28 -04:00
|
|
|
|
|
|
|
it_behaves_like 'a Taskable' do
|
2015-04-16 16:25:25 -04:00
|
|
|
subject { create :merge_request, :simple }
|
2014-10-05 22:17:28 -04:00
|
|
|
end
|
2015-11-20 17:43:10 -05:00
|
|
|
|
2016-08-12 10:22:48 -04:00
|
|
|
describe '#commits_sha' do
|
|
|
|
before do
|
2016-12-01 06:17:30 -05:00
|
|
|
allow(subject.merge_request_diff).to receive(:commits_sha).
|
|
|
|
and_return(['sha1'])
|
2016-08-12 10:22:48 -04:00
|
|
|
end
|
|
|
|
|
2016-12-01 06:17:30 -05:00
|
|
|
it 'delegates to merge request diff' do
|
|
|
|
expect(subject.commits_sha).to eq ['sha1']
|
2016-08-12 10:22:48 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-11-28 05:13:32 -05:00
|
|
|
describe '#head_pipeline' do
|
2015-11-20 17:43:10 -05:00
|
|
|
describe 'when the source project exists' do
|
2016-06-20 12:48:04 -04:00
|
|
|
it 'returns the latest pipeline' do
|
2017-05-05 15:00:18 -04:00
|
|
|
pipeline = create(:ci_empty_pipeline, project: subject.source_project, ref: 'master', status: 'running', sha: "123abc")
|
2017-03-22 15:36:14 -04:00
|
|
|
subject.update(head_pipeline: pipeline)
|
2015-11-20 17:43:10 -05:00
|
|
|
|
2016-11-28 05:13:32 -05:00
|
|
|
expect(subject.head_pipeline).to eq(pipeline)
|
2015-11-20 17:43:10 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'when the source project does not exist' do
|
|
|
|
it 'returns nil' do
|
|
|
|
allow(subject).to receive(:source_project).and_return(nil)
|
|
|
|
|
2016-11-28 05:13:32 -05:00
|
|
|
expect(subject.head_pipeline).to be_nil
|
2015-11-20 17:43:10 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-05-26 07:38:28 -04:00
|
|
|
|
2016-08-12 10:22:48 -04:00
|
|
|
describe '#all_pipelines' do
|
2016-09-19 11:51:27 -04:00
|
|
|
shared_examples 'returning pipelines with proper ordering' do
|
2016-09-20 08:07:56 -04:00
|
|
|
let!(:all_pipelines) do
|
|
|
|
subject.all_commits_sha.map do |sha|
|
|
|
|
create(:ci_empty_pipeline,
|
|
|
|
project: subject.source_project,
|
|
|
|
sha: sha,
|
|
|
|
ref: subject.source_branch)
|
2016-09-19 11:51:27 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns all pipelines' do
|
|
|
|
expect(subject.all_pipelines).not_to be_empty
|
2016-09-20 08:07:56 -04:00
|
|
|
expect(subject.all_pipelines).to eq(all_pipelines.reverse)
|
2016-08-15 16:53:09 -04:00
|
|
|
end
|
2016-08-12 10:22:48 -04:00
|
|
|
end
|
|
|
|
|
2016-09-19 11:51:27 -04:00
|
|
|
context 'with single merge_request_diffs' do
|
|
|
|
it_behaves_like 'returning pipelines with proper ordering'
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with multiple irrelevant merge_request_diffs' do
|
|
|
|
before do
|
2016-09-22 05:01:01 -04:00
|
|
|
subject.update(target_branch: 'v1.0.0')
|
2016-09-19 11:51:27 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'returning pipelines with proper ordering'
|
2016-08-12 10:22:48 -04:00
|
|
|
end
|
2016-09-20 08:51:14 -04:00
|
|
|
|
|
|
|
context 'with unsaved merge request' do
|
2016-09-20 13:03:47 -04:00
|
|
|
subject { build(:merge_request) }
|
2016-09-20 08:51:14 -04:00
|
|
|
|
|
|
|
let!(:pipeline) do
|
|
|
|
create(:ci_empty_pipeline,
|
2016-09-20 13:03:47 -04:00
|
|
|
project: subject.project,
|
2016-09-20 08:51:14 -04:00
|
|
|
sha: subject.diff_head_sha,
|
|
|
|
ref: subject.source_branch)
|
2016-08-15 16:53:09 -04:00
|
|
|
end
|
2016-09-20 08:51:14 -04:00
|
|
|
|
|
|
|
it 'returns pipelines from diff_head_sha' do
|
|
|
|
expect(subject.all_pipelines).to contain_exactly(pipeline)
|
|
|
|
end
|
|
|
|
end
|
2016-08-12 10:22:48 -04:00
|
|
|
end
|
|
|
|
|
2016-09-20 08:07:56 -04:00
|
|
|
describe '#all_commits_sha' do
|
2016-10-17 09:31:21 -04:00
|
|
|
context 'when merge request is persisted' do
|
|
|
|
let(:all_commits_sha) do
|
|
|
|
subject.merge_request_diffs.flat_map(&:commits).map(&:sha).uniq
|
|
|
|
end
|
2016-09-20 08:07:56 -04:00
|
|
|
|
2016-10-17 09:31:21 -04:00
|
|
|
shared_examples 'returning all SHA' do
|
|
|
|
it 'returns all SHA from all merge_request_diffs' do
|
|
|
|
expect(subject.merge_request_diffs.size).to eq(2)
|
|
|
|
expect(subject.all_commits_sha).to eq(all_commits_sha)
|
|
|
|
end
|
2016-09-22 05:01:01 -04:00
|
|
|
end
|
|
|
|
|
2016-10-17 09:31:21 -04:00
|
|
|
context 'with a completely different branch' do
|
|
|
|
before do
|
|
|
|
subject.update(target_branch: 'v1.0.0')
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'returning all SHA'
|
2016-09-22 05:01:01 -04:00
|
|
|
end
|
|
|
|
|
2016-10-17 09:31:21 -04:00
|
|
|
context 'with a branch having no difference' do
|
|
|
|
before do
|
|
|
|
subject.update(target_branch: 'v1.1.0')
|
|
|
|
subject.reload # make sure commits were not cached
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'returning all SHA'
|
|
|
|
end
|
2016-08-12 10:22:48 -04:00
|
|
|
end
|
|
|
|
|
2016-10-17 09:31:21 -04:00
|
|
|
context 'when merge request is not persisted' do
|
|
|
|
context 'when compare commits are set in the service' do
|
|
|
|
let(:commit) { spy('commit') }
|
|
|
|
|
|
|
|
subject do
|
|
|
|
build(:merge_request, compare_commits: [commit, commit])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns commits from compare commits temporary data' do
|
|
|
|
expect(subject.all_commits_sha).to eq [commit, commit]
|
|
|
|
end
|
2016-09-22 05:01:01 -04:00
|
|
|
end
|
|
|
|
|
2016-10-17 09:31:21 -04:00
|
|
|
context 'when compare commits are not set in the service' do
|
|
|
|
subject { build(:merge_request) }
|
|
|
|
|
|
|
|
it 'returns array with diff head sha element only' do
|
|
|
|
expect(subject.all_commits_sha).to eq [subject.diff_head_sha]
|
|
|
|
end
|
|
|
|
end
|
2016-08-12 10:22:48 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-05-26 07:38:28 -04:00
|
|
|
describe '#participants' do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:empty_project, :public) }
|
2016-05-26 07:38:28 -04:00
|
|
|
|
|
|
|
let(:mr) do
|
|
|
|
create(:merge_request, source_project: project, target_project: project)
|
|
|
|
end
|
|
|
|
|
|
|
|
let!(:note1) do
|
|
|
|
create(:note_on_merge_request, noteable: mr, project: project, note: 'a')
|
|
|
|
end
|
|
|
|
|
|
|
|
let!(:note2) do
|
|
|
|
create(:note_on_merge_request, noteable: mr, project: project, note: 'b')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'includes the merge request author' do
|
|
|
|
expect(mr.participants).to include(mr.author)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'includes the authors of the notes' do
|
|
|
|
expect(mr.participants).to include(note1.author, note2.author)
|
|
|
|
end
|
|
|
|
end
|
2016-06-02 09:25:40 -04:00
|
|
|
|
|
|
|
describe 'cached counts' do
|
|
|
|
it 'updates when assignees change' do
|
|
|
|
user1 = create(:user)
|
|
|
|
user2 = create(:user)
|
|
|
|
mr = create(:merge_request, assignee: user1)
|
2017-04-19 11:17:46 -04:00
|
|
|
mr.project.add_developer(user1)
|
|
|
|
mr.project.add_developer(user2)
|
2016-06-02 09:25:40 -04:00
|
|
|
|
2017-04-19 11:17:46 -04:00
|
|
|
expect(user1.assigned_open_merge_requests_count).to eq(1)
|
|
|
|
expect(user2.assigned_open_merge_requests_count).to eq(0)
|
2016-06-02 09:25:40 -04:00
|
|
|
|
|
|
|
mr.assignee = user2
|
|
|
|
mr.save
|
|
|
|
|
2017-04-19 11:17:46 -04:00
|
|
|
expect(user1.assigned_open_merge_requests_count).to eq(0)
|
|
|
|
expect(user2.assigned_open_merge_requests_count).to eq(1)
|
2016-06-02 09:25:40 -04:00
|
|
|
end
|
|
|
|
end
|
2016-04-27 14:34:42 -04:00
|
|
|
|
|
|
|
describe '#check_if_can_be_merged' do
|
2017-02-17 08:56:13 -05:00
|
|
|
let(:project) { create(:empty_project, only_allow_merge_if_pipeline_succeeds: true) }
|
2016-04-27 14:34:42 -04:00
|
|
|
|
|
|
|
subject { create(:merge_request, source_project: project, merge_status: :unchecked) }
|
|
|
|
|
|
|
|
context 'when it is not broken and has no conflicts' do
|
2016-12-14 09:37:31 -05:00
|
|
|
before do
|
2016-04-27 14:34:42 -04:00
|
|
|
allow(subject).to receive(:broken?) { false }
|
2016-06-20 12:48:04 -04:00
|
|
|
allow(project.repository).to receive(:can_be_merged?).and_return(true)
|
2016-12-14 09:37:31 -05:00
|
|
|
end
|
2016-04-27 14:34:42 -04:00
|
|
|
|
2016-12-14 09:37:31 -05:00
|
|
|
it 'is marked as mergeable' do
|
2016-04-27 14:34:42 -04:00
|
|
|
expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('can_be_merged')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when broken' do
|
|
|
|
before { allow(subject).to receive(:broken?) { true } }
|
|
|
|
|
|
|
|
it 'becomes unmergeable' do
|
|
|
|
expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('cannot_be_merged')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when it has conflicts' do
|
|
|
|
before do
|
|
|
|
allow(subject).to receive(:broken?) { false }
|
2016-06-20 12:48:04 -04:00
|
|
|
allow(project.repository).to receive(:can_be_merged?).and_return(false)
|
2016-04-27 14:34:42 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'becomes unmergeable' do
|
|
|
|
expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('cannot_be_merged')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#mergeable?' do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:empty_project) }
|
2016-06-07 07:01:34 -04:00
|
|
|
|
|
|
|
subject { create(:merge_request, source_project: project) }
|
|
|
|
|
2016-06-09 10:08:38 -04:00
|
|
|
it 'returns false if #mergeable_state? is false' do
|
|
|
|
expect(subject).to receive(:mergeable_state?) { false }
|
2016-06-07 07:01:34 -04:00
|
|
|
|
2016-06-09 10:08:38 -04:00
|
|
|
expect(subject.mergeable?).to be_falsey
|
2016-06-07 07:01:34 -04:00
|
|
|
end
|
|
|
|
|
2016-06-09 10:08:38 -04:00
|
|
|
it 'return true if #mergeable_state? is true and the MR #can_be_merged? is true' do
|
2016-06-07 07:01:34 -04:00
|
|
|
allow(subject).to receive(:mergeable_state?) { true }
|
|
|
|
expect(subject).to receive(:check_if_can_be_merged)
|
2016-06-09 10:08:38 -04:00
|
|
|
expect(subject).to receive(:can_be_merged?) { true }
|
2016-06-07 07:01:34 -04:00
|
|
|
|
|
|
|
expect(subject.mergeable?).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#mergeable_state?' do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:project, :repository) }
|
2016-04-27 14:34:42 -04:00
|
|
|
|
|
|
|
subject { create(:merge_request, source_project: project) }
|
|
|
|
|
2016-06-07 07:01:34 -04:00
|
|
|
it 'checks if merge request can be merged' do
|
2016-06-09 10:08:38 -04:00
|
|
|
allow(subject).to receive(:mergeable_ci_state?) { true }
|
2016-04-27 14:34:42 -04:00
|
|
|
expect(subject).to receive(:check_if_can_be_merged)
|
|
|
|
|
|
|
|
subject.mergeable?
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when not open' do
|
|
|
|
before { subject.close }
|
|
|
|
|
|
|
|
it 'returns false' do
|
2016-06-07 07:01:34 -04:00
|
|
|
expect(subject.mergeable_state?).to be_falsey
|
2016-04-27 14:34:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when working in progress' do
|
|
|
|
before { subject.title = 'WIP MR' }
|
|
|
|
|
|
|
|
it 'returns false' do
|
2016-06-07 07:01:34 -04:00
|
|
|
expect(subject.mergeable_state?).to be_falsey
|
2016-04-27 14:34:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when broken' do
|
|
|
|
before { allow(subject).to receive(:broken?) { true } }
|
|
|
|
|
|
|
|
it 'returns false' do
|
2016-06-07 07:01:34 -04:00
|
|
|
expect(subject.mergeable_state?).to be_falsey
|
2016-04-27 14:34:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when failed' do
|
2016-10-26 13:19:17 -04:00
|
|
|
context 'when #mergeable_ci_state? is false' do
|
2016-06-07 07:01:34 -04:00
|
|
|
before do
|
2016-06-09 10:08:38 -04:00
|
|
|
allow(subject).to receive(:mergeable_ci_state?) { false }
|
2016-06-07 07:01:34 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false' do
|
|
|
|
expect(subject.mergeable_state?).to be_falsey
|
2016-04-27 14:34:42 -04:00
|
|
|
end
|
|
|
|
end
|
2016-09-16 07:02:42 -04:00
|
|
|
|
2016-10-26 13:19:17 -04:00
|
|
|
context 'when #mergeable_discussions_state? is false' do
|
2016-09-16 07:02:42 -04:00
|
|
|
before do
|
|
|
|
allow(subject).to receive(:mergeable_discussions_state?) { false }
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false' do
|
|
|
|
expect(subject.mergeable_state?).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
2016-04-27 14:34:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-09 10:08:38 -04:00
|
|
|
describe '#mergeable_ci_state?' do
|
2017-02-17 08:56:13 -05:00
|
|
|
let(:project) { create(:empty_project, only_allow_merge_if_pipeline_succeeds: true) }
|
2016-06-10 08:41:38 -04:00
|
|
|
let(:pipeline) { create(:ci_empty_pipeline) }
|
2016-04-27 14:34:42 -04:00
|
|
|
|
|
|
|
subject { build(:merge_request, target_project: project) }
|
|
|
|
|
2016-06-09 10:08:38 -04:00
|
|
|
context 'when it is only allowed to merge when build is green' do
|
2016-06-10 08:41:38 -04:00
|
|
|
context 'and a failed pipeline is associated' do
|
2016-06-09 10:08:38 -04:00
|
|
|
before do
|
2016-11-18 12:30:07 -05:00
|
|
|
pipeline.update(status: 'failed')
|
2016-11-28 05:13:32 -05:00
|
|
|
allow(subject).to receive(:head_pipeline) { pipeline }
|
2016-06-09 10:08:38 -04:00
|
|
|
end
|
2016-04-27 14:34:42 -04:00
|
|
|
|
2016-06-09 10:08:38 -04:00
|
|
|
it { expect(subject.mergeable_ci_state?).to be_falsey }
|
2016-04-27 14:34:42 -04:00
|
|
|
end
|
|
|
|
|
2016-11-18 12:30:07 -05:00
|
|
|
context 'and a successful pipeline is associated' do
|
|
|
|
before do
|
|
|
|
pipeline.update(status: 'success')
|
2016-11-28 05:13:32 -05:00
|
|
|
allow(subject).to receive(:head_pipeline) { pipeline }
|
2016-11-18 12:30:07 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(subject.mergeable_ci_state?).to be_truthy }
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'and a skipped pipeline is associated' do
|
|
|
|
before do
|
|
|
|
pipeline.update(status: 'skipped')
|
2016-11-28 05:13:32 -05:00
|
|
|
allow(subject).to receive(:head_pipeline) { pipeline }
|
2016-11-18 12:30:07 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(subject.mergeable_ci_state?).to be_truthy }
|
|
|
|
end
|
|
|
|
|
2016-06-10 08:41:38 -04:00
|
|
|
context 'when no pipeline is associated' do
|
2016-06-09 10:08:38 -04:00
|
|
|
before do
|
2016-11-28 05:13:32 -05:00
|
|
|
allow(subject).to receive(:head_pipeline) { nil }
|
2016-06-09 10:08:38 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(subject.mergeable_ci_state?).to be_truthy }
|
2016-04-27 14:34:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-09 10:08:38 -04:00
|
|
|
context 'when merges are not restricted to green builds' do
|
2017-02-17 08:56:13 -05:00
|
|
|
subject { build(:merge_request, target_project: build(:empty_project, only_allow_merge_if_pipeline_succeeds: false)) }
|
2016-04-27 14:34:42 -04:00
|
|
|
|
2016-06-10 08:41:38 -04:00
|
|
|
context 'and a failed pipeline is associated' do
|
2016-06-09 10:08:38 -04:00
|
|
|
before do
|
2016-06-10 08:41:38 -04:00
|
|
|
pipeline.statuses << create(:commit_status, status: 'failed', project: project)
|
2016-11-28 05:13:32 -05:00
|
|
|
allow(subject).to receive(:head_pipeline) { pipeline }
|
2016-06-09 10:08:38 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(subject.mergeable_ci_state?).to be_truthy }
|
|
|
|
end
|
|
|
|
|
2016-06-10 08:41:38 -04:00
|
|
|
context 'when no pipeline is associated' do
|
2016-06-09 10:08:38 -04:00
|
|
|
before do
|
2016-11-28 05:13:32 -05:00
|
|
|
allow(subject).to receive(:head_pipeline) { nil }
|
2016-06-09 10:08:38 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(subject.mergeable_ci_state?).to be_truthy }
|
2016-04-27 14:34:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-07-01 17:53:46 -04:00
|
|
|
|
2016-09-16 07:02:42 -04:00
|
|
|
describe '#mergeable_discussions_state?' do
|
2016-10-26 13:19:17 -04:00
|
|
|
let(:merge_request) { create(:merge_request_with_diff_notes, source_project: project) }
|
2016-09-16 07:02:42 -04:00
|
|
|
|
2016-10-26 13:19:17 -04:00
|
|
|
context 'when project.only_allow_merge_if_all_discussions_are_resolved == true' do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:project, :repository, only_allow_merge_if_all_discussions_are_resolved: true) }
|
2016-09-16 07:02:42 -04:00
|
|
|
|
2016-10-26 13:19:17 -04:00
|
|
|
context 'with all discussions resolved' do
|
2016-09-16 07:02:42 -04:00
|
|
|
before do
|
2016-10-26 13:19:17 -04:00
|
|
|
merge_request.discussions.each { |d| d.resolve!(merge_request.author) }
|
2016-09-16 07:02:42 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true' do
|
2016-10-26 13:19:17 -04:00
|
|
|
expect(merge_request.mergeable_discussions_state?).to be_truthy
|
2016-09-16 07:02:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-10-26 13:19:17 -04:00
|
|
|
context 'with unresolved discussions' do
|
2016-09-16 07:02:42 -04:00
|
|
|
before do
|
2016-10-26 13:19:17 -04:00
|
|
|
merge_request.discussions.each(&:unresolve!)
|
2016-09-16 07:02:42 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false' do
|
2016-10-26 13:19:17 -04:00
|
|
|
expect(merge_request.mergeable_discussions_state?).to be_falsey
|
2016-09-16 07:02:42 -04:00
|
|
|
end
|
|
|
|
end
|
2016-11-23 07:00:58 -05:00
|
|
|
|
|
|
|
context 'with no discussions' do
|
|
|
|
before do
|
|
|
|
merge_request.notes.destroy_all
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true' do
|
|
|
|
expect(merge_request.mergeable_discussions_state?).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
2016-09-16 07:02:42 -04:00
|
|
|
end
|
|
|
|
|
2016-10-26 13:19:17 -04:00
|
|
|
context 'when project.only_allow_merge_if_all_discussions_are_resolved == false' do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:project, :repository, only_allow_merge_if_all_discussions_are_resolved: false) }
|
2016-09-16 07:02:42 -04:00
|
|
|
|
2016-10-26 13:19:17 -04:00
|
|
|
context 'with unresolved discussions' do
|
2016-09-16 07:02:42 -04:00
|
|
|
before do
|
2016-10-26 13:19:17 -04:00
|
|
|
merge_request.discussions.each(&:unresolve!)
|
2016-09-16 07:02:42 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true' do
|
2016-10-26 13:19:17 -04:00
|
|
|
expect(merge_request.mergeable_discussions_state?).to be_truthy
|
2016-09-16 07:02:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-02-06 19:06:46 -05:00
|
|
|
describe "#environments_for" do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:project, :repository) }
|
2017-02-06 19:06:46 -05:00
|
|
|
let(:user) { project.creator }
|
2016-08-03 07:37:39 -04:00
|
|
|
let(:merge_request) { create(:merge_request, source_project: project) }
|
|
|
|
|
2017-02-06 19:06:46 -05:00
|
|
|
before do
|
|
|
|
merge_request.source_project.add_master(user)
|
|
|
|
merge_request.target_project.add_master(user)
|
|
|
|
end
|
|
|
|
|
2016-09-21 06:08:11 -04:00
|
|
|
context 'with multiple environments' do
|
|
|
|
let(:environments) { create_list(:environment, 3, project: project) }
|
2016-08-09 09:11:14 -04:00
|
|
|
|
2016-09-21 06:08:11 -04:00
|
|
|
before do
|
|
|
|
create(:deployment, environment: environments.first, ref: 'master', sha: project.commit('master').id)
|
|
|
|
create(:deployment, environment: environments.second, ref: 'feature', sha: project.commit('feature').id)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'selects deployed environments' do
|
2017-02-06 19:06:46 -05:00
|
|
|
expect(merge_request.environments_for(user)).to contain_exactly(environments.first)
|
2016-09-21 06:08:11 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with environments on source project' do
|
|
|
|
let(:source_project) do
|
2017-01-19 16:57:15 -05:00
|
|
|
create(:project, :repository) do |fork_project|
|
2016-09-21 06:08:11 -04:00
|
|
|
fork_project.create_forked_project_link(forked_to_project_id: fork_project.id, forked_from_project_id: project.id)
|
|
|
|
end
|
|
|
|
end
|
2016-09-21 06:32:15 -04:00
|
|
|
|
2016-09-21 06:08:11 -04:00
|
|
|
let(:merge_request) do
|
|
|
|
create(:merge_request,
|
|
|
|
source_project: source_project, source_branch: 'feature',
|
|
|
|
target_project: project)
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:source_environment) { create(:environment, project: source_project) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
create(:deployment, environment: source_environment, ref: 'feature', sha: merge_request.diff_head_sha)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'selects deployed environments' do
|
2017-02-06 19:06:46 -05:00
|
|
|
expect(merge_request.environments_for(user)).to contain_exactly(source_environment)
|
2016-09-21 06:08:11 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'with environments on target project' do
|
|
|
|
let(:target_environment) { create(:environment, project: project) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
create(:deployment, environment: target_environment, tag: true, sha: merge_request.diff_head_sha)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'selects deployed environments' do
|
2017-02-06 19:06:46 -05:00
|
|
|
expect(merge_request.environments_for(user)).to contain_exactly(source_environment, target_environment)
|
2016-09-21 06:08:11 -04:00
|
|
|
end
|
|
|
|
end
|
2016-09-16 04:16:21 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'without a diff_head_commit' do
|
|
|
|
before do
|
|
|
|
expect(merge_request).to receive(:diff_head_commit).and_return(nil)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns an empty array' do
|
2017-02-06 19:06:46 -05:00
|
|
|
expect(merge_request.environments_for(user)).to be_empty
|
2016-09-16 04:16:21 -04:00
|
|
|
end
|
2016-08-03 07:37:39 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-01 17:53:46 -04:00
|
|
|
describe "#reload_diff" do
|
|
|
|
let(:note) { create(:diff_note_on_merge_request, project: subject.project, noteable: subject) }
|
|
|
|
|
|
|
|
let(:commit) { subject.project.commit(sample_commit.id) }
|
|
|
|
|
2016-07-25 11:42:57 -04:00
|
|
|
it "does not change existing merge request diff" do
|
2016-07-28 11:41:57 -04:00
|
|
|
expect(subject.merge_request_diff).not_to receive(:save_git_content)
|
2016-07-01 17:53:46 -04:00
|
|
|
subject.reload_diff
|
|
|
|
end
|
|
|
|
|
2016-07-25 11:42:57 -04:00
|
|
|
it "creates new merge request diff" do
|
|
|
|
expect { subject.reload_diff }.to change { subject.merge_request_diffs.count }.by(1)
|
|
|
|
end
|
|
|
|
|
2016-07-26 03:21:42 -04:00
|
|
|
it "executs diff cache service" do
|
|
|
|
expect_any_instance_of(MergeRequests::MergeRequestDiffCacheService).to receive(:execute).with(subject)
|
|
|
|
|
|
|
|
subject.reload_diff
|
|
|
|
end
|
|
|
|
|
2016-07-01 17:53:46 -04:00
|
|
|
it "updates diff note positions" do
|
|
|
|
old_diff_refs = subject.diff_refs
|
|
|
|
|
|
|
|
# Update merge_request_diff so that #diff_refs will return commit.diff_refs
|
2016-07-25 11:42:57 -04:00
|
|
|
allow(subject).to receive(:create_merge_request_diff) do
|
|
|
|
subject.merge_request_diffs.create(
|
|
|
|
base_commit_sha: commit.parent_id,
|
|
|
|
start_commit_sha: commit.parent_id,
|
|
|
|
head_commit_sha: commit.sha
|
|
|
|
)
|
2016-08-02 11:07:50 -04:00
|
|
|
|
|
|
|
subject.merge_request_diff(true)
|
2016-07-01 17:53:46 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
expect(Notes::DiffPositionUpdateService).to receive(:new).with(
|
|
|
|
subject.project,
|
|
|
|
nil,
|
|
|
|
old_diff_refs: old_diff_refs,
|
|
|
|
new_diff_refs: commit.diff_refs,
|
|
|
|
paths: note.position.paths
|
|
|
|
).and_call_original
|
|
|
|
|
2016-07-25 11:42:57 -04:00
|
|
|
expect_any_instance_of(Notes::DiffPositionUpdateService).to receive(:execute).with(note)
|
2016-07-01 17:53:46 -04:00
|
|
|
expect_any_instance_of(DiffNote).to receive(:save).once
|
|
|
|
|
|
|
|
subject.reload_diff
|
|
|
|
end
|
|
|
|
end
|
2016-08-08 16:00:11 -04:00
|
|
|
|
|
|
|
describe '#branch_merge_base_commit' do
|
|
|
|
context 'source and target branch exist' do
|
|
|
|
it { expect(subject.branch_merge_base_commit.sha).to eq('ae73cb07c9eeaf35924a10f713b364d32b2dd34f') }
|
|
|
|
it { expect(subject.branch_merge_base_commit).to be_a(Commit) }
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the target branch does not exist' do
|
|
|
|
before do
|
|
|
|
subject.project.repository.raw_repository.delete_branch(subject.target_branch)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns nil' do
|
|
|
|
expect(subject.branch_merge_base_commit).to be_nil
|
2016-08-15 11:11:18 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-08-22 07:18:58 -04:00
|
|
|
describe "#diff_sha_refs" do
|
2016-08-01 10:55:51 -04:00
|
|
|
context "with diffs" do
|
|
|
|
subject { create(:merge_request, :with_diffs) }
|
|
|
|
|
|
|
|
it "does not touch the repository" do
|
|
|
|
subject # Instantiate the object
|
|
|
|
|
|
|
|
expect_any_instance_of(Repository).not_to receive(:commit)
|
|
|
|
|
2016-08-22 07:18:58 -04:00
|
|
|
subject.diff_sha_refs
|
2016-08-01 10:55:51 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it "returns expected diff_refs" do
|
|
|
|
expected_diff_refs = Gitlab::Diff::DiffRefs.new(
|
|
|
|
base_sha: subject.merge_request_diff.base_commit_sha,
|
|
|
|
start_sha: subject.merge_request_diff.start_commit_sha,
|
|
|
|
head_sha: subject.merge_request_diff.head_commit_sha
|
|
|
|
)
|
|
|
|
|
2016-08-22 07:18:58 -04:00
|
|
|
expect(subject.diff_sha_refs).to eq(expected_diff_refs)
|
2016-08-08 16:00:11 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-08-12 16:49:25 -04:00
|
|
|
|
2016-10-19 14:33:51 -04:00
|
|
|
describe "#source_project_missing?" do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:empty_project) }
|
|
|
|
let(:fork_project) { create(:empty_project, forked_from_project: project) }
|
2016-07-26 07:57:43 -04:00
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) }
|
|
|
|
|
2016-08-10 09:36:30 -04:00
|
|
|
context "when the fork exists" do
|
2016-07-26 07:57:43 -04:00
|
|
|
let(:merge_request) do
|
|
|
|
create(:merge_request,
|
|
|
|
source_project: fork_project,
|
|
|
|
target_project: project)
|
|
|
|
end
|
|
|
|
|
2016-10-19 14:33:51 -04:00
|
|
|
it { expect(merge_request.source_project_missing?).to be_falsey }
|
2016-07-26 07:57:43 -04:00
|
|
|
end
|
|
|
|
|
2016-08-10 09:36:30 -04:00
|
|
|
context "when the source project is the same as the target project" do
|
2016-07-26 07:57:43 -04:00
|
|
|
let(:merge_request) { create(:merge_request, source_project: project) }
|
|
|
|
|
2016-10-19 14:33:51 -04:00
|
|
|
it { expect(merge_request.source_project_missing?).to be_falsey }
|
2016-07-26 07:57:43 -04:00
|
|
|
end
|
|
|
|
|
2016-08-10 09:36:30 -04:00
|
|
|
context "when the fork does not exist" do
|
2016-07-26 07:57:43 -04:00
|
|
|
let(:merge_request) do
|
|
|
|
create(:merge_request,
|
|
|
|
source_project: fork_project,
|
|
|
|
target_project: project)
|
|
|
|
end
|
|
|
|
|
2016-08-09 09:43:15 -04:00
|
|
|
it "returns true" do
|
2016-07-26 07:57:43 -04:00
|
|
|
unlink_project.execute
|
|
|
|
merge_request.reload
|
|
|
|
|
2016-10-19 14:33:51 -04:00
|
|
|
expect(merge_request.source_project_missing?).to be_truthy
|
2016-07-26 07:57:43 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "#closed_without_fork?" do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:empty_project) }
|
|
|
|
let(:fork_project) { create(:empty_project, forked_from_project: project) }
|
2016-07-26 07:57:43 -04:00
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) }
|
|
|
|
|
2016-08-10 09:36:30 -04:00
|
|
|
context "when the merge request is closed" do
|
2016-07-26 07:57:43 -04:00
|
|
|
let(:closed_merge_request) do
|
|
|
|
create(:closed_merge_request,
|
|
|
|
source_project: fork_project,
|
|
|
|
target_project: project)
|
|
|
|
end
|
|
|
|
|
2016-08-10 09:36:30 -04:00
|
|
|
it "returns false if the fork exist" do
|
2016-07-26 07:57:43 -04:00
|
|
|
expect(closed_merge_request.closed_without_fork?).to be_falsey
|
|
|
|
end
|
|
|
|
|
2016-08-10 09:36:30 -04:00
|
|
|
it "returns true if the fork does not exist" do
|
2016-07-26 07:57:43 -04:00
|
|
|
unlink_project.execute
|
|
|
|
closed_merge_request.reload
|
|
|
|
|
|
|
|
expect(closed_merge_request.closed_without_fork?).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
2016-08-09 09:43:15 -04:00
|
|
|
|
2016-08-10 09:36:30 -04:00
|
|
|
context "when the merge request is open" do
|
2016-08-09 09:43:15 -04:00
|
|
|
let(:open_merge_request) do
|
|
|
|
create(:merge_request,
|
|
|
|
source_project: fork_project,
|
|
|
|
target_project: project)
|
|
|
|
end
|
|
|
|
|
|
|
|
it "returns false" do
|
|
|
|
expect(open_merge_request.closed_without_fork?).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
2016-07-26 07:57:43 -04:00
|
|
|
end
|
2016-09-05 07:42:35 -04:00
|
|
|
|
2016-09-13 08:40:00 -04:00
|
|
|
describe '#reopenable?' do
|
2016-09-08 07:25:16 -04:00
|
|
|
context 'when the merge request is closed' do
|
|
|
|
it 'returns true' do
|
|
|
|
subject.close
|
2016-09-06 10:48:59 -04:00
|
|
|
|
2016-09-13 08:40:00 -04:00
|
|
|
expect(subject.reopenable?).to be_truthy
|
2016-09-08 07:25:16 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'forked project' do
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:project) { create(:empty_project) }
|
2016-09-08 07:25:16 -04:00
|
|
|
let(:user) { create(:user) }
|
2017-01-19 16:57:15 -05:00
|
|
|
let(:fork_project) { create(:empty_project, forked_from_project: project, namespace: user.namespace) }
|
2016-10-24 13:56:39 -04:00
|
|
|
|
|
|
|
let!(:merge_request) do
|
2016-09-08 07:25:16 -04:00
|
|
|
create(:closed_merge_request,
|
|
|
|
source_project: fork_project,
|
|
|
|
target_project: project)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false if unforked' do
|
|
|
|
Projects::UnlinkForkService.new(fork_project, user).execute
|
|
|
|
|
2016-09-13 08:40:00 -04:00
|
|
|
expect(merge_request.reload.reopenable?).to be_falsey
|
2016-09-08 07:25:16 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false if the source project is deleted' do
|
2016-09-13 08:40:00 -04:00
|
|
|
Projects::DestroyService.new(fork_project, user).execute
|
2016-09-08 07:25:16 -04:00
|
|
|
|
2016-09-13 08:40:00 -04:00
|
|
|
expect(merge_request.reload.reopenable?).to be_falsey
|
2016-09-08 07:25:16 -04:00
|
|
|
end
|
|
|
|
|
2016-09-13 06:16:40 -04:00
|
|
|
it 'returns false if the merge request is merged' do
|
2016-09-08 07:25:16 -04:00
|
|
|
merge_request.update_attributes(state: 'merged')
|
|
|
|
|
2016-09-13 08:40:00 -04:00
|
|
|
expect(merge_request.reload.reopenable?).to be_falsey
|
2016-09-08 07:25:16 -04:00
|
|
|
end
|
|
|
|
end
|
2016-09-06 10:48:59 -04:00
|
|
|
end
|
|
|
|
|
2016-09-08 08:20:11 -04:00
|
|
|
context 'when the merge request is opened' do
|
2016-09-08 07:25:16 -04:00
|
|
|
it 'returns false' do
|
2016-09-13 08:40:00 -04:00
|
|
|
expect(subject.reopenable?).to be_falsey
|
2016-09-08 07:25:16 -04:00
|
|
|
end
|
2016-09-06 10:48:59 -04:00
|
|
|
end
|
|
|
|
end
|
2016-12-01 06:17:30 -05:00
|
|
|
|
2016-11-24 09:05:15 -05:00
|
|
|
describe '#mergeable_with_slash_command?' do
|
|
|
|
def create_pipeline(status)
|
2017-03-22 15:36:14 -04:00
|
|
|
pipeline = create(:ci_pipeline_with_one_job,
|
2016-11-24 09:05:15 -05:00
|
|
|
project: project,
|
|
|
|
ref: merge_request.source_branch,
|
|
|
|
sha: merge_request.diff_head_sha,
|
|
|
|
status: status)
|
2017-03-22 15:36:14 -04:00
|
|
|
|
|
|
|
merge_request.update(head_pipeline: pipeline)
|
2017-03-28 16:04:14 -04:00
|
|
|
|
|
|
|
pipeline
|
2016-11-24 09:05:15 -05:00
|
|
|
end
|
|
|
|
|
2017-02-17 08:56:13 -05:00
|
|
|
let(:project) { create(:project, :public, :repository, only_allow_merge_if_pipeline_succeeds: true) }
|
2016-11-24 09:05:15 -05:00
|
|
|
let(:developer) { create(:user) }
|
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:merge_request) { create(:merge_request, source_project: project) }
|
|
|
|
let(:mr_sha) { merge_request.diff_head_sha }
|
|
|
|
|
|
|
|
before do
|
|
|
|
project.team << [developer, :developer]
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when autocomplete_precheck is set to true' do
|
|
|
|
it 'is mergeable by developer' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(developer, autocomplete_precheck: true)).to be_truthy
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is not mergeable by normal user' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(user, autocomplete_precheck: true)).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when autocomplete_precheck is set to false' do
|
|
|
|
it 'is mergeable by developer' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: mr_sha)).to be_truthy
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is not mergeable by normal user' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(user, last_diff_sha: mr_sha)).to be_falsey
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'closed MR' do
|
|
|
|
before do
|
|
|
|
merge_request.update_attribute(:state, :closed)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is not mergeable' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: mr_sha)).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'MR with WIP' do
|
|
|
|
before do
|
|
|
|
merge_request.update_attribute(:title, 'WIP: some MR')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is not mergeable' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: mr_sha)).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'sha differs from the MR diff_head_sha' do
|
|
|
|
it 'is not mergeable' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: 'some other sha')).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-12-30 14:49:59 -05:00
|
|
|
context 'sha is not provided' do
|
|
|
|
it 'is not mergeable' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(developer)).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-11-24 09:05:15 -05:00
|
|
|
context 'with pipeline ok' do
|
|
|
|
before do
|
|
|
|
create_pipeline(:success)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is mergeable' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: mr_sha)).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with failing pipeline' do
|
|
|
|
before do
|
|
|
|
create_pipeline(:failed)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is not mergeable' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: mr_sha)).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with running pipeline' do
|
|
|
|
before do
|
2017-03-28 16:04:14 -04:00
|
|
|
create_pipeline(:running)
|
2016-11-24 09:05:15 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'is mergeable' do
|
|
|
|
expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: mr_sha)).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-12-01 06:17:30 -05:00
|
|
|
describe '#has_commits?' do
|
|
|
|
before do
|
|
|
|
allow(subject.merge_request_diff).to receive(:commits_count).
|
|
|
|
and_return(2)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true when merge request diff has commits' do
|
|
|
|
expect(subject.has_commits?).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#has_no_commits?' do
|
|
|
|
before do
|
|
|
|
allow(subject.merge_request_diff).to receive(:commits_count).
|
|
|
|
and_return(0)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true when merge request diff has 0 commits' do
|
|
|
|
expect(subject.has_no_commits?).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
2017-04-30 16:32:09 -04:00
|
|
|
|
|
|
|
describe '#merge_request_diff_for' do
|
|
|
|
subject { create(:merge_request, importing: true) }
|
|
|
|
let!(:merge_request_diff1) { subject.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
|
|
|
|
let!(:merge_request_diff2) { subject.merge_request_diffs.create(head_commit_sha: nil) }
|
|
|
|
let!(:merge_request_diff3) { subject.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
|
|
|
|
|
|
|
|
context 'with diff refs' do
|
|
|
|
it 'returns the diffs' do
|
|
|
|
expect(subject.merge_request_diff_for(merge_request_diff1.diff_refs)).to eq(merge_request_diff1)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with a commit SHA' do
|
|
|
|
it 'returns the diffs' do
|
|
|
|
expect(subject.merge_request_diff_for(merge_request_diff3.head_commit_sha)).to eq(merge_request_diff3)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2011-11-28 02:39:43 -05:00
|
|
|
end
|