merge_request_spec.rb 41.9 KB
Newer Older
D
Dmitriy Zaporozhets 已提交
1 2
require 'spec_helper'

D
Douwe Maan 已提交
3
describe MergeRequest, models: true do
4 5
  include RepoHelpers

6 7
  subject { create(:merge_request) }

R
Robert Speicher 已提交
8 9 10
  describe 'associations' do
    it { is_expected.to belong_to(:target_project).with_foreign_key(:target_project_id).class_name('Project') }
    it { is_expected.to belong_to(:source_project).with_foreign_key(:source_project_id).class_name('Project') }
11
    it { is_expected.to belong_to(:merge_user).class_name("User") }
12
    it { is_expected.to have_many(:merge_request_diffs).dependent(:destroy) }
R
Robert Speicher 已提交
13 14
  end

15 16 17 18 19 20 21 22 23 24
  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

Z
Zeger-Jan van de Weg 已提交
25 26 27 28 29
  describe "act_as_paranoid" do
    it { is_expected.to have_db_column(:deleted_at) }
    it { is_expected.to have_db_index(:deleted_at) }
  end

30
  describe 'validation' do
31 32
    it { is_expected.to validate_presence_of(:target_branch) }
    it { is_expected.to validate_presence_of(:source_branch) }
Z
Zeger-Jan van de Weg 已提交
33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50

    context "Validation of merge user with Merge When Build succeeds" do
      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
        subject.merge_when_build_succeeds = true
        expect(subject).not_to be_valid
      end

      it "is valid with merge user" do
        subject.merge_when_build_succeeds = true
        subject.merge_user = build(:user)

        expect(subject).to be_valid
      end
    end
D
Dmitriy Zaporozhets 已提交
51 52
  end

R
Robert Speicher 已提交
53
  describe 'respond to' do
54 55 56
    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?) }
57 58
    it { is_expected.to respond_to(:merge_params) }
    it { is_expected.to respond_to(:merge_when_build_succeeds) }
59
  end
A
Andrey Kumanyaev 已提交
60

61 62 63 64 65 66
  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

67
  describe '#target_branch_sha' do
68
    let(:project) { create(:project) }
69

70
    subject { create(:merge_request, source_project: project, target_project: project) }
71

72
    context 'when the target branch does not exist' do
73 74 75
      before do
        project.repository.raw_repository.delete_branch(subject.target_branch)
      end
76 77

      it 'returns nil' do
78
        expect(subject.target_branch_sha).to be_nil
79 80
      end
    end
81 82 83 84 85 86

    it 'returns memoized value' do
      subject.target_branch_sha = '8ffb3c15a5475e59ae909384297fede4badcb4c7'

      expect(subject.target_branch_sha).to eq '8ffb3c15a5475e59ae909384297fede4badcb4c7'
    end
87 88
  end

89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112
  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])

      expect { subject.cache_merge_request_closes_issues! }.to change(subject.merge_requests_closing_issues, :count).by(1)
    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])

      expect { subject.cache_merge_request_closes_issues! }.not_to change(subject.merge_requests_closing_issues, :count)
    end
  end

113
  describe '#source_branch_sha' do
114 115 116 117 118
    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
119
        expect(subject.source_branch_sha).to eq(last_branch_commit.sha)
120 121 122
      end
    end

123 124 125
    context 'without diffs' do
      subject { create(:merge_request, :without_diffs) }
      it 'returns the sha of the source branch last commit' do
126
        expect(subject.source_branch_sha).to eq(last_branch_commit.sha)
127 128 129
      end
    end

130 131 132
    context 'when the merge request is being created' do
      subject { build(:merge_request, source_branch: nil, compare_commits: []) }
      it 'returns nil' do
133
        expect(subject.source_branch_sha).to be_nil
134 135
      end
    end
136 137 138 139 140 141

    it 'returns memoized value' do
      subject.source_branch_sha = '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'

      expect(subject.source_branch_sha).to eq '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
    end
142 143
  end

144 145 146 147 148 149 150 151 152
  describe '#to_reference' do
    it 'returns a String reference to the object' do
      expect(subject.to_reference).to eq "!#{subject.iid}"
    end

    it 'supports a cross-project reference' do
      cross = double('project')
      expect(subject.to_reference(cross)).to eq "#{subject.source_project.to_reference}!#{subject.iid}"
    end
153
  end
154

155
  describe '#raw_diffs' do
S
Sean McGivern 已提交
156 157 158 159 160 161 162
    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

163
        expect(merge_request.merge_request_diff).to receive(:raw_diffs).with(options)
S
Sean McGivern 已提交
164

165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
        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

S
Sean McGivern 已提交
180 181 182 183 184 185
  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
186
        merge_request.save
S
Sean McGivern 已提交
187

188
        expect(merge_request.merge_request_diff).to receive(:raw_diffs).with(hash_including(options))
S
Sean McGivern 已提交
189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204

        merge_request.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(:diffs).with(options)

        merge_request.diffs(options)
      end
    end
  end

205
  describe "#mr_and_commit_notes" do
206
    let!(:merge_request) { create(:merge_request) }
207 208

    before do
209
      allow(merge_request).to receive(:commits) { [merge_request.source_project.repository.commit] }
210 211
      create(:note_on_commit, commit_id: merge_request.commits.first.id,
                              project: merge_request.project)
D
Dmitriy Zaporozhets 已提交
212
      create(:note, noteable: merge_request, project: merge_request.project)
213 214
    end

215
    it "includes notes for commits" do
216 217
      expect(merge_request.commits).not_to be_empty
      expect(merge_request.mr_and_commit_notes.count).to eq(2)
218
    end
219

220
    it "includes notes for commits from target project as well" do
221 222 223
      create(:note_on_commit, commit_id: merge_request.commits.first.id,
                              project: merge_request.target_project)

224 225 226
      expect(merge_request.commits).not_to be_empty
      expect(merge_request.mr_and_commit_notes.count).to eq(3)
    end
227
  end
228 229 230

  describe '#is_being_reassigned?' do
    it 'returns true if the merge_request assignee has changed' do
231
      subject.assignee = create(:user)
232
      expect(subject.is_being_reassigned?).to be_truthy
233 234
    end
    it 'returns false if the merge request assignee has not changed' do
235
      expect(subject.is_being_reassigned?).to be_falsey
236 237
    end
  end
I
Izaak Alpert 已提交
238 239 240

  describe '#for_fork?' do
    it 'returns true if the merge request is for a fork' do
D
Dmitriy Zaporozhets 已提交
241 242
      subject.source_project = create(:project, namespace: create(:group))
      subject.target_project = create(:project, namespace: create(:group))
I
Izaak Alpert 已提交
243

244
      expect(subject.for_fork?).to be_truthy
I
Izaak Alpert 已提交
245
    end
D
Dmitriy Zaporozhets 已提交
246

I
Izaak Alpert 已提交
247
    it 'returns false if is not for a fork' do
248
      expect(subject.for_fork?).to be_falsey
I
Izaak Alpert 已提交
249 250 251
    end
  end

252 253 254
  describe 'detection of issues to be closed' do
    let(:issue0) { create :issue, project: subject.project }
    let(:issue1) { create :issue, project: subject.project }
255 256 257 258

    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}") }
259 260

    before do
261
      subject.project.team << [subject.author, :developer]
262
      allow(subject).to receive(:commits).and_return([commit0, commit1, commit2])
263 264 265
    end

    it 'accesses the set of issues that will be closed on acceptance' do
266 267
      allow(subject.project).to receive(:default_branch).
        and_return(subject.target_branch)
268

269 270 271
      closed = subject.closes_issues

      expect(closed).to include(issue0, issue1)
272 273 274
    end

    it 'only lists issues as to be closed if it targets the default branch' do
275
      allow(subject.project).to receive(:default_branch).and_return('master')
276 277
      subject.target_branch = 'something-else'

278
      expect(subject.closes_issues).to be_empty
279
    end
280 281 282

    it 'detects issues mentioned in the description' do
      issue2 = create(:issue, project: subject.project)
283
      subject.description = "Closes #{issue2.to_reference}"
284 285
      allow(subject.project).to receive(:default_branch).
        and_return(subject.target_branch)
286

287
      expect(subject.closes_issues).to include(issue2)
288
    end
289 290
  end

291
  describe "#work_in_progress?" do
292 293 294
    ['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}"
295
        expect(subject.work_in_progress?).to eq true
296
      end
T
Ted Hogan 已提交
297 298
    end

299 300
    it "doesn't detect WIP for words starting with WIP" do
      subject.title = "Wipwap #{subject.title}"
301
      expect(subject.work_in_progress?).to eq false
302 303
    end

304 305
    it "doesn't detect WIP for words containing with WIP" do
      subject.title = "WupWipwap #{subject.title}"
306
      expect(subject.work_in_progress?).to eq false
307 308
    end

309
    it "doesn't detect WIP by default" do
310
      expect(subject.work_in_progress?).to eq false
311 312 313
    end
  end

T
Thomas Balthazar 已提交
314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336
  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
337
    end
T
Thomas Balthazar 已提交
338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353

    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

Z
Zeger-Jan van de Weg 已提交
354
  describe '#can_remove_source_branch?' do
Z
Zeger-Jan van de Weg 已提交
355 356
    let(:user) { create(:user) }
    let(:user2) { create(:user) }
357 358 359 360

    before do
      subject.source_project.team << [user, :master]

Z
Zeger-Jan van de Weg 已提交
361 362 363 364
      subject.source_branch = "feature"
      subject.target_branch = "master"
      subject.save!
    end
365

Z
Zeger-Jan van de Weg 已提交
366 367
    it "can't be removed when its a protected branch" do
      allow(subject.source_project).to receive(:protected_branch?).and_return(true)
368 369 370
      expect(subject.can_remove_source_branch?(user)).to be_falsey
    end

371
    it "can't remove a root ref" do
Z
Zeger-Jan van de Weg 已提交
372 373
      subject.source_branch = "master"
      subject.target_branch = "feature"
374 375 376 377

      expect(subject.can_remove_source_branch?(user)).to be_falsey
    end

Z
Zeger-Jan van de Weg 已提交
378 379 380 381
    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

382
    it "can be removed if the last commit is the head of the source branch" do
383
      allow(subject).to receive(:source_branch_head).and_return(subject.diff_head_commit)
384

Z
Zeger-Jan van de Weg 已提交
385
      expect(subject.can_remove_source_branch?(user)).to be_truthy
386
    end
387 388

    it "cannot be removed if the last commit is not also the head of the source branch" do
389 390
      subject.source_branch = "lfs"

391 392
      expect(subject.can_remove_source_branch?(user)).to be_falsey
    end
393 394
  end

395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430
  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

    it 'includes its description in the body' do
      request = build(:merge_request, description: 'By removing all code')

      expect(request.merge_commit_message)
        .to match("By removing all code\n\n")
    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
  end

431
  describe "#reset_merge_when_build_succeeds" do
432 433 434 435
    let(:merge_if_green) do
      create :merge_request, merge_when_build_succeeds: true, merge_user: create(:user),
                             merge_params: { "should_remove_source_branch" => "1", "commit_message" => "msg" }
    end
Z
Zeger-Jan van de Weg 已提交
436

437 438 439 440 441
    it "sets the item to false" do
      merge_if_green.reset_merge_when_build_succeeds
      merge_if_green.reload

      expect(merge_if_green.merge_when_build_succeeds).to be_falsey
442 443
      expect(merge_if_green.merge_params["should_remove_source_branch"]).to be_nil
      expect(merge_if_green.merge_params["commit_message"]).to be_nil
444 445 446
    end
  end

447
  describe "#hook_attrs" do
448 449 450 451 452 453 454 455 456 457 458
    let(:attrs_hash) { subject.hook_attrs.to_h }

    [: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

459
    it "has all the required keys" do
460 461 462 463
      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)
464
    end
465 466 467 468 469 470
  end

  describe '#diverged_commits_count' do
    let(:project)      { create(:project) }
    let(:fork_project) { create(:project, forked_from_project: project) }

471
    context 'when the target branch does not exist anymore' do
472 473 474 475 476 477
      subject { create(:merge_request, source_project: project, target_project: project) }

      before do
        project.repository.raw_repository.delete_branch(subject.target_branch)
        subject.reload
      end
478 479 480 481 482 483 484 485 486 487

      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

488 489 490 491
    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
492
        expect(subject.diverged_commits_count).to eq(29)
493 494 495 496 497 498 499
      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
500
        expect(subject.diverged_commits_count).to eq(29)
501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531
      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
532
        allow(subject).to receive(:source_branch_sha).and_return('123abc')
533 534 535 536 537 538 539 540 541
        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
542
        allow(subject).to receive(:target_branch_sha).and_return('123abc')
543 544 545
        subject.diverged_commits_count
      end
    end
546 547
  end

548
  it_behaves_like 'an editable mentionable' do
549
    subject { create(:merge_request, :simple) }
550

551 552
    let(:backref_text) { "merge request #{subject.to_reference}" }
    let(:set_mentionable_text) { ->(txt){ subject.description = txt } }
553
  end
V
Vinnie Okada 已提交
554 555

  it_behaves_like 'a Taskable' do
556
    subject { create :merge_request, :simple }
V
Vinnie Okada 已提交
557
  end
558

559 560 561 562 563 564
  describe '#commits_sha' do
    let(:commit0) { double('commit0', sha: 'sha1') }
    let(:commit1) { double('commit1', sha: 'sha2') }
    let(:commit2) { double('commit2', sha: 'sha3') }

    before do
565
      allow(subject.merge_request_diff).to receive(:commits).and_return([commit0, commit1, commit2])
566 567 568 569 570 571 572
    end

    it 'returns sha of commits' do
      expect(subject.commits_sha).to contain_exactly('sha1', 'sha2', 'sha3')
    end
  end

573
  describe '#pipeline' do
574
    describe 'when the source project exists' do
575
      it 'returns the latest pipeline' do
576
        pipeline = double(:ci_pipeline, ref: 'master')
577

578
        allow(subject).to receive(:diff_head_sha).and_return('123abc')
579

L
Lin Jen-Shin 已提交
580 581
        expect(subject.source_project).to receive(:pipeline_for).
          with('master', '123abc').
582
          and_return(pipeline)
583

584
        expect(subject.pipeline).to eq(pipeline)
585 586 587 588 589 590 591
      end
    end

    describe 'when the source project does not exist' do
      it 'returns nil' do
        allow(subject).to receive(:source_project).and_return(nil)

592
        expect(subject.pipeline).to be_nil
593 594 595
      end
    end
  end
Y
Yorick Peterse 已提交
596

597
  describe '#all_pipelines' do
598
    shared_examples 'returning pipelines with proper ordering' do
599 600 601 602 603 604
      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)
605 606 607 608 609
        end
      end

      it 'returns all pipelines' do
        expect(subject.all_pipelines).not_to be_empty
610
        expect(subject.all_pipelines).to eq(all_pipelines.reverse)
611
      end
612 613
    end

614 615 616 617 618 619
    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
620
        subject.update(target_branch: 'v1.0.0')
621 622 623
      end

      it_behaves_like 'returning pipelines with proper ordering'
624
    end
625 626

    context 'with unsaved merge request' do
627
      subject { build(:merge_request) }
628 629 630

      let!(:pipeline) do
        create(:ci_empty_pipeline,
631
               project: subject.project,
632 633
               sha: subject.diff_head_sha,
               ref: subject.source_branch)
634
      end
635 636 637 638 639

      it 'returns pipelines from diff_head_sha' do
        expect(subject.all_pipelines).to contain_exactly(pipeline)
      end
    end
640 641
  end

642
  describe '#all_commits_sha' do
643 644 645 646
    context 'when merge request is persisted' do
      let(:all_commits_sha) do
        subject.merge_request_diffs.flat_map(&:commits).map(&:sha).uniq
      end
647

648 649 650 651 652
      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
653 654
      end

655 656 657 658 659 660
      context 'with a completely different branch' do
        before do
          subject.update(target_branch: 'v1.0.0')
        end

        it_behaves_like 'returning all SHA'
661 662
      end

663 664 665 666 667 668 669 670
      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
671 672
    end

673 674 675 676 677 678 679 680 681 682 683
    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
684 685
      end

686 687 688 689 690 691 692
      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
693 694 695
    end
  end

Y
Yorick Peterse 已提交
696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718
  describe '#participants' do
    let(:project) { create(:project, :public) }

    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
J
Josh Frye 已提交
719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735

  describe 'cached counts' do
    it 'updates when assignees change' do
      user1 = create(:user)
      user2 = create(:user)
      mr = create(:merge_request, assignee: user1)

      expect(user1.assigned_open_merge_request_count).to eq(1)
      expect(user2.assigned_open_merge_request_count).to eq(0)

      mr.assignee = user2
      mr.save

      expect(user1.assigned_open_merge_request_count).to eq(0)
      expect(user2.assigned_open_merge_request_count).to eq(1)
    end
  end
736 737 738 739 740 741 742 743 744

  describe '#check_if_can_be_merged' do
    let(:project) { create(:project, only_allow_merge_if_build_succeeds: true) }

    subject { create(:merge_request, source_project: project, merge_status: :unchecked) }

    context 'when it is not broken and has no conflicts' do
      it 'is marked as mergeable' do
        allow(subject).to receive(:broken?) { false }
745
        allow(project.repository).to receive(:can_be_merged?).and_return(true)
746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761

        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 }
762
        allow(project.repository).to receive(:can_be_merged?).and_return(false)
763 764 765 766 767 768 769 770 771
      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
772 773 774 775
    let(:project) { create(:project) }

    subject { create(:merge_request, source_project: project) }

776 777
    it 'returns false if #mergeable_state? is false' do
      expect(subject).to receive(:mergeable_state?) { false }
778

779
      expect(subject.mergeable?).to be_falsey
780 781
    end

782
    it 'return true if #mergeable_state? is true and the MR #can_be_merged? is true' do
783 784
      allow(subject).to receive(:mergeable_state?) { true }
      expect(subject).to receive(:check_if_can_be_merged)
785
      expect(subject).to receive(:can_be_merged?) { true }
786 787 788 789 790 791 792

      expect(subject.mergeable?).to be_truthy
    end
  end

  describe '#mergeable_state?' do
    let(:project) { create(:project) }
793 794 795

    subject { create(:merge_request, source_project: project) }

796
    it 'checks if merge request can be merged' do
797
      allow(subject).to receive(:mergeable_ci_state?) { true }
798 799 800 801 802 803 804 805 806
      expect(subject).to receive(:check_if_can_be_merged)

      subject.mergeable?
    end

    context 'when not open' do
      before { subject.close }

      it 'returns false' do
807
        expect(subject.mergeable_state?).to be_falsey
808 809 810 811 812 813 814
      end
    end

    context 'when working in progress' do
      before { subject.title = 'WIP MR' }

      it 'returns false' do
815
        expect(subject.mergeable_state?).to be_falsey
816 817 818 819 820 821 822
      end
    end

    context 'when broken' do
      before { allow(subject).to receive(:broken?) { true } }

      it 'returns false' do
823
        expect(subject.mergeable_state?).to be_falsey
824 825 826 827 828 829
      end
    end

    context 'when failed' do
      before { allow(subject).to receive(:broken?) { false } }

830 831 832
      context 'when project settings restrict to merge only if build succeeds and build failed' do
        before do
          project.only_allow_merge_if_build_succeeds = true
833
          allow(subject).to receive(:mergeable_ci_state?) { false }
834 835 836 837
        end

        it 'returns false' do
          expect(subject.mergeable_state?).to be_falsey
838 839 840 841 842
        end
      end
    end
  end

843
  describe '#mergeable_ci_state?' do
844
    let(:project) { create(:empty_project, only_allow_merge_if_build_succeeds: true) }
R
Rémy Coutable 已提交
845
    let(:pipeline) { create(:ci_empty_pipeline) }
846 847 848

    subject { build(:merge_request, target_project: project) }

849
    context 'when it is only allowed to merge when build is green' do
R
Rémy Coutable 已提交
850
      context 'and a failed pipeline is associated' do
851
        before do
R
Rémy Coutable 已提交
852 853
          pipeline.statuses << create(:commit_status, status: 'failed', project: project)
          allow(subject).to receive(:pipeline) { pipeline }
854
        end
855

856
        it { expect(subject.mergeable_ci_state?).to be_falsey }
857 858
      end

R
Rémy Coutable 已提交
859
      context 'when no pipeline is associated' do
860
        before do
R
Rémy Coutable 已提交
861
          allow(subject).to receive(:pipeline) { nil }
862 863 864
        end

        it { expect(subject.mergeable_ci_state?).to be_truthy }
865 866 867
      end
    end

868
    context 'when merges are not restricted to green builds' do
869 870
      subject { build(:merge_request, target_project: build(:empty_project, only_allow_merge_if_build_succeeds: false)) }

R
Rémy Coutable 已提交
871
      context 'and a failed pipeline is associated' do
872
        before do
R
Rémy Coutable 已提交
873 874
          pipeline.statuses << create(:commit_status, status: 'failed', project: project)
          allow(subject).to receive(:pipeline) { pipeline }
875 876 877 878 879
        end

        it { expect(subject.mergeable_ci_state?).to be_truthy }
      end

R
Rémy Coutable 已提交
880
      context 'when no pipeline is associated' do
881
        before do
R
Rémy Coutable 已提交
882
          allow(subject).to receive(:pipeline) { nil }
883 884 885
        end

        it { expect(subject.mergeable_ci_state?).to be_truthy }
886 887 888
      end
    end
  end
889

890
  describe '#environments' do
Z
Z.J. van de Weg 已提交
891 892 893
    let(:project)       { create(:project) }
    let(:merge_request) { create(:merge_request, source_project: project) }

894 895
    context 'with multiple environments' do
      let(:environments) { create_list(:environment, 3, project: project) }
896

897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912
      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
        expect(merge_request.environments).to contain_exactly(environments.first)
      end
    end

    context 'with environments on source project' do
      let(:source_project) do
        create(:project) do |fork_project|
          fork_project.create_forked_project_link(forked_to_project_id: fork_project.id, forked_from_project_id: project.id)
        end
      end
K
Kamil Trzcinski 已提交
913

914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940
      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
        expect(merge_request.environments).to contain_exactly(source_environment)
      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
          expect(merge_request.environments).to contain_exactly(source_environment, target_environment)
        end
      end
941 942 943 944 945 946 947 948 949 950
    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
        expect(merge_request.environments).to be_empty
      end
Z
Z.J. van de Weg 已提交
951 952 953
    end
  end

954 955 956 957 958
  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) }

959
    it "does not change existing merge request diff" do
960
      expect(subject.merge_request_diff).not_to receive(:save_git_content)
961 962 963
      subject.reload_diff
    end

964 965 966 967
    it "creates new merge request diff" do
      expect { subject.reload_diff }.to change { subject.merge_request_diffs.count }.by(1)
    end

968 969 970 971 972 973
    it "executs diff cache service" do
      expect_any_instance_of(MergeRequests::MergeRequestDiffCacheService).to receive(:execute).with(subject)

      subject.reload_diff
    end

974 975 976 977
    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
978 979 980 981 982 983
      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
        )
984 985

        subject.merge_request_diff(true)
986 987 988 989 990 991 992 993 994 995
      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

996
      expect_any_instance_of(Notes::DiffPositionUpdateService).to receive(:execute).with(note)
997 998 999 1000 1001
      expect_any_instance_of(DiffNote).to receive(:save).once

      subject.reload_diff
    end
  end
1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015

  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
1016 1017 1018 1019
      end
    end
  end

1020
  describe "#diff_sha_refs" do
1021 1022 1023 1024 1025 1026 1027 1028
    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)

1029
        subject.diff_sha_refs
1030 1031 1032 1033 1034 1035 1036 1037 1038
      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
        )

1039
        expect(subject.diff_sha_refs).to eq(expected_diff_refs)
1040 1041 1042
      end
    end
  end
1043 1044 1045 1046 1047 1048 1049

  context "discussion status" do
    let(:first_discussion) { Discussion.new([create(:diff_note_on_merge_request)]) }
    let(:second_discussion) { Discussion.new([create(:diff_note_on_merge_request)]) }
    let(:third_discussion) { Discussion.new([create(:diff_note_on_merge_request)]) }

    before do
1050
      allow(subject).to receive(:diff_discussions).and_return([first_discussion, second_discussion, third_discussion])
1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134
    end

    describe "#discussions_resolvable?" do
      context "when all discussions are unresolvable" do
        before do
          allow(first_discussion).to receive(:resolvable?).and_return(false)
          allow(second_discussion).to receive(:resolvable?).and_return(false)
          allow(third_discussion).to receive(:resolvable?).and_return(false)
        end

        it "returns false" do
          expect(subject.discussions_resolvable?).to be false
        end
      end

      context "when some discussions are unresolvable and some discussions are resolvable" do
        before do
          allow(first_discussion).to receive(:resolvable?).and_return(true)
          allow(second_discussion).to receive(:resolvable?).and_return(false)
          allow(third_discussion).to receive(:resolvable?).and_return(true)
        end

        it "returns true" do
          expect(subject.discussions_resolvable?).to be true
        end
      end

      context "when all discussions are resolvable" do
        before do
          allow(first_discussion).to receive(:resolvable?).and_return(true)
          allow(second_discussion).to receive(:resolvable?).and_return(true)
          allow(third_discussion).to receive(:resolvable?).and_return(true)
        end

        it "returns true" do
          expect(subject.discussions_resolvable?).to be true
        end
      end
    end

    describe "#discussions_resolved?" do
      context "when discussions are not resolvable" do
        before do
          allow(subject).to receive(:discussions_resolvable?).and_return(false)
        end

        it "returns false" do
          expect(subject.discussions_resolved?).to be false
        end
      end

      context "when discussions are resolvable" do
        before do
          allow(subject).to receive(:discussions_resolvable?).and_return(true)

          allow(first_discussion).to receive(:resolvable?).and_return(true)
          allow(second_discussion).to receive(:resolvable?).and_return(false)
          allow(third_discussion).to receive(:resolvable?).and_return(true)
        end

        context "when all resolvable discussions are resolved" do
          before do
            allow(first_discussion).to receive(:resolved?).and_return(true)
            allow(third_discussion).to receive(:resolved?).and_return(true)
          end

          it "returns true" do
            expect(subject.discussions_resolved?).to be true
          end
        end

        context "when some resolvable discussions are not resolved" do
          before do
            allow(first_discussion).to receive(:resolved?).and_return(true)
            allow(third_discussion).to receive(:resolved?).and_return(false)
          end

          it "returns false" do
            expect(subject.discussions_resolved?).to be false
          end
        end
      end
    end
  end
S
Sean McGivern 已提交
1135

1136
  describe '#conflicts_can_be_resolved_in_ui?' do
S
Sean McGivern 已提交
1137 1138 1139 1140 1141 1142 1143 1144 1145 1146
    def create_merge_request(source_branch)
      create(:merge_request, source_branch: source_branch, target_branch: 'conflict-start') do |mr|
        mr.mark_as_unmergeable
      end
    end

    it 'returns a falsey value when the MR can be merged without conflicts' do
      merge_request = create_merge_request('master')
      merge_request.mark_as_mergeable

1147
      expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_falsey
S
Sean McGivern 已提交
1148 1149
    end

1150 1151 1152 1153 1154 1155
    it 'returns a falsey value when the MR is marked as having conflicts, but has none' do
      merge_request = create_merge_request('master')

      expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_falsey
    end

1156 1157 1158 1159 1160 1161 1162
    it 'returns a falsey value when the MR has a missing ref after a force push' do
      merge_request = create_merge_request('conflict-resolvable')
      allow(merge_request.conflicts).to receive(:merge_index).and_raise(Rugged::OdbError)

      expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_falsey
    end

S
Sean McGivern 已提交
1163 1164 1165 1166
    it 'returns a falsey value when the MR does not support new diff notes' do
      merge_request = create_merge_request('conflict-resolvable')
      merge_request.merge_request_diff.update_attributes(start_commit_sha: nil)

1167
      expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_falsey
S
Sean McGivern 已提交
1168 1169 1170 1171 1172
    end

    it 'returns a falsey value when the conflicts contain a large file' do
      merge_request = create_merge_request('conflict-too-large')

1173
      expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_falsey
S
Sean McGivern 已提交
1174 1175 1176 1177 1178
    end

    it 'returns a falsey value when the conflicts contain a binary file' do
      merge_request = create_merge_request('conflict-binary-file')

1179
      expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_falsey
S
Sean McGivern 已提交
1180 1181 1182 1183 1184
    end

    it 'returns a falsey value when the conflicts contain a file edited in one branch and deleted in another' do
      merge_request = create_merge_request('conflict-missing-side')

1185
      expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_falsey
S
Sean McGivern 已提交
1186 1187 1188 1189 1190
    end

    it 'returns a truthy value when the conflicts are resolvable in the UI' do
      merge_request = create_merge_request('conflict-resolvable')

1191
      expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_truthy
S
Sean McGivern 已提交
1192
    end
S
Sean McGivern 已提交
1193 1194 1195 1196 1197 1198

    it 'returns a truthy value when the conflicts have to be resolved in an editor' do
      merge_request = create_merge_request('conflict-contains-conflict-markers')

      expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_truthy
    end
S
Sean McGivern 已提交
1199
  end
1200

K
Katarzyna Kobierska 已提交
1201
  describe "#forked_source_project_missing?" do
1202 1203 1204 1205 1206
    let(:project)      { create(:project) }
    let(:fork_project) { create(:project, forked_from_project: project) }
    let(:user)         { create(:user) }
    let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) }

K
Katarzyna Kobierska 已提交
1207
    context "when the fork exists" do
1208 1209 1210 1211 1212 1213
      let(:merge_request) do
        create(:merge_request,
          source_project: fork_project,
          target_project: project)
      end

K
Katarzyna Kobierska 已提交
1214
      it { expect(merge_request.forked_source_project_missing?).to be_falsey }
1215 1216
    end

K
Katarzyna Kobierska 已提交
1217
    context "when the source project is the same as the target project" do
1218 1219
      let(:merge_request) { create(:merge_request, source_project: project) }

K
Katarzyna Kobierska 已提交
1220
      it { expect(merge_request.forked_source_project_missing?).to be_falsey }
1221 1222
    end

K
Katarzyna Kobierska 已提交
1223
    context "when the fork does not exist" do
1224 1225 1226 1227 1228 1229
      let(:merge_request) do
        create(:merge_request,
          source_project: fork_project,
          target_project: project)
      end

K
Katarzyna Kobierska 已提交
1230
      it "returns true" do
1231 1232 1233
        unlink_project.execute
        merge_request.reload

K
Katarzyna Kobierska 已提交
1234
        expect(merge_request.forked_source_project_missing?).to be_truthy
1235 1236 1237 1238 1239 1240 1241 1242 1243 1244
      end
    end
  end

  describe "#closed_without_fork?" do
    let(:project)      { create(:project) }
    let(:fork_project) { create(:project, forked_from_project: project) }
    let(:user)         { create(:user) }
    let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) }

K
Katarzyna Kobierska 已提交
1245
    context "when the merge request is closed" do
1246 1247 1248 1249 1250 1251
      let(:closed_merge_request) do
        create(:closed_merge_request,
          source_project: fork_project,
          target_project: project)
      end

K
Katarzyna Kobierska 已提交
1252
      it "returns false if the fork exist" do
1253 1254 1255
        expect(closed_merge_request.closed_without_fork?).to be_falsey
      end

K
Katarzyna Kobierska 已提交
1256
      it "returns true if the fork does not exist" do
1257 1258 1259 1260 1261 1262
        unlink_project.execute
        closed_merge_request.reload

        expect(closed_merge_request.closed_without_fork?).to be_truthy
      end
    end
K
Katarzyna Kobierska 已提交
1263

K
Katarzyna Kobierska 已提交
1264
    context "when the merge request is open" do
K
Katarzyna Kobierska 已提交
1265 1266 1267 1268 1269 1270 1271 1272 1273 1274
      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
1275
  end
1276

1277
  describe '#reopenable?' do
K
Katarzyna Kobierska 已提交
1278 1279 1280
    context 'when the merge request is closed' do
      it 'returns true' do
        subject.close
K
Katarzyna Kobierska 已提交
1281

1282
        expect(subject.reopenable?).to be_truthy
K
Katarzyna Kobierska 已提交
1283 1284 1285 1286 1287
      end

      context 'forked project' do
        let(:project)      { create(:project) }
        let(:user)         { create(:user) }
1288
        let(:fork_project) { create(:project, forked_from_project: project, namespace: user.namespace) }
K
Katarzyna Kobierska 已提交
1289 1290 1291 1292 1293 1294 1295 1296 1297
        let(:merge_request) do
          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

1298
          expect(merge_request.reload.reopenable?).to be_falsey
K
Katarzyna Kobierska 已提交
1299 1300 1301
        end

        it 'returns false if the source project is deleted' do
1302
          Projects::DestroyService.new(fork_project, user).execute
K
Katarzyna Kobierska 已提交
1303

1304
          expect(merge_request.reload.reopenable?).to be_falsey
K
Katarzyna Kobierska 已提交
1305 1306
        end

K
Katarzyna Kobierska 已提交
1307
        it 'returns false if the merge request is merged' do
K
Katarzyna Kobierska 已提交
1308 1309
          merge_request.update_attributes(state: 'merged')

1310
          expect(merge_request.reload.reopenable?).to be_falsey
K
Katarzyna Kobierska 已提交
1311 1312
        end
      end
K
Katarzyna Kobierska 已提交
1313 1314
    end

K
Katarzyna Kobierska 已提交
1315
    context 'when the merge request is opened' do
K
Katarzyna Kobierska 已提交
1316
      it 'returns false' do
1317
        expect(subject.reopenable?).to be_falsey
K
Katarzyna Kobierska 已提交
1318
      end
K
Katarzyna Kobierska 已提交
1319 1320
    end
  end
D
Dmitriy Zaporozhets 已提交
1321
end