user_sees_merge_widget_spec.rb 23.6 KB
Newer Older
1 2
require 'rails_helper'

3
describe 'Merge request > User sees merge widget', :js do
4
  include ProjectForksHelper
5
  include TestReportsHelper
6

7
  let(:project) { create(:project, :repository) }
8
  let(:project_only_mwps) { create(:project, :repository, only_allow_merge_if_pipeline_succeeds: true) }
9
  let(:user) { project.creator }
10
  let(:merge_request) { create(:merge_request, source_project: project) }
11
  let(:merge_request_in_only_mwps_project) { create(:merge_request, source_project: project_only_mwps) }
12 13

  before do
14 15
    project.add_maintainer(user)
    project_only_mwps.add_maintainer(user)
16
    sign_in(user)
17
  end
18

19 20
  context 'new merge request' do
    before do
21
      visit project_new_merge_request_path(
22 23 24 25
        project,
        merge_request: {
          source_project_id: project.id,
          target_project_id: project.id,
26
          source_branch: 'feature',
27
          target_branch: 'master'
28
        })
29 30 31 32 33
    end

    it 'shows widget status after creating new merge request' do
      click_button 'Submit merge request'

34
      wait_for_requests
35

36
      expect(page).to have_selector('.accept-merge-request')
Fatih Acet's avatar
Fatih Acet committed
37
      expect(find('.accept-merge-request')['disabled']).not_to be(true)
38
    end
39 40
  end

41 42
  context 'view merge request' do
    let!(:environment) { create(:environment, project: project) }
43 44 45
    let(:sha)          { project.commit(merge_request.source_branch).sha }
    let(:pipeline)     { create(:ci_pipeline_without_jobs, status: 'success', sha: sha, project: project, ref: merge_request.source_branch) }
    let(:build)        { create(:ci_build, :success, pipeline: pipeline) }
46 47

    let!(:deployment) do
48 49
      create(:deployment, :succeed,
                          environment: environment,
50 51 52
                          ref: merge_request.source_branch,
                          deployable: build,
                          sha: sha)
53
    end
54

55
    before do
56
      merge_request.update!(head_pipeline: pipeline)
57
      visit project_merge_request_path(project, merge_request)
58
    end
59

60
    it 'shows environments link' do
61
      wait_for_requests
62

63
      page.within('.js-pre-deployment') do
64
        expect(page).to have_content("Deployed to #{environment.name}")
Fatih Acet's avatar
Fatih Acet committed
65
        expect(find('.js-deploy-url')[:href]).to include(environment.formatted_external_url)
66 67
      end
    end
68 69 70

    it 'shows green accept merge request button' do
      # Wait for the `ci_status` and `merge_check` requests
71
      wait_for_requests
Fatih Acet's avatar
Fatih Acet committed
72 73
      expect(page).to have_selector('.accept-merge-request')
      expect(find('.accept-merge-request')['disabled']).not_to be(true)
74
    end
75 76 77 78 79 80 81 82 83 84 85 86

    it 'allows me to merge, see cherry-pick modal and load branches list' do
      wait_for_requests
      click_button 'Merge'

      wait_for_requests
      click_link 'Cherry-pick'
      page.find('.js-project-refs-dropdown').click
      wait_for_requests

      expect(page.all('.js-cherry-pick-form .dropdown-content li').size).to be > 1
    end
87 88 89 90 91 92 93 94 95
  end

  context 'view merge request with external CI service' do
    before do
      create(:service, project: project,
                       active: true,
                       type: 'CiService',
                       category: 'ci')

96
      visit project_merge_request_path(project, merge_request)
97 98 99 100
    end

    it 'has danger button while waiting for external CI status' do
      # Wait for the `ci_status` and `merge_check` requests
101
      wait_for_requests
102 103 104 105 106 107 108 109 110 111 112
      expect(page).to have_selector('.accept-merge-request.btn-danger')
    end
  end

  context 'view merge request with failed GitLab CI pipelines' do
    before do
      commit_status = create(:commit_status, project: project, status: 'failed')
      pipeline = create(:ci_pipeline, project: project,
                                      sha: merge_request.diff_head_sha,
                                      ref: merge_request.source_branch,
                                      status: 'failed',
113 114
                                      statuses: [commit_status],
                                      head_pipeline_of: merge_request)
115 116
      create(:ci_build, :pending, pipeline: pipeline)

117
      visit project_merge_request_path(project, merge_request)
118 119 120 121
    end

    it 'has danger button when not succeeded' do
      # Wait for the `ci_status` and `merge_check` requests
122
      wait_for_requests
123 124 125 126
      expect(page).to have_selector('.accept-merge-request.btn-danger')
    end
  end

127 128
  context 'when merge request is in the blocked pipeline state' do
    before do
129
      create(
Felipe Artur's avatar
Felipe Artur committed
130 131 132 133
        :ci_pipeline,
        project: project,
        sha: merge_request.diff_head_sha,
        ref: merge_request.source_branch,
134 135
        status: :manual,
        head_pipeline_of: merge_request)
136

137
      visit project_merge_request_path(project, merge_request)
138 139 140 141 142 143 144 145 146 147
    end

    it 'shows information about blocked pipeline' do
      expect(page).to have_content("Pipeline blocked")
      expect(page).to have_content(
        "The pipeline for this merge request requires a manual action")
      expect(page).to have_css('.ci-status-icon-manual')
    end
  end

148 149 150 151 152 153 154 155 156 157 158 159 160 161 162
  context 'when merge request has a branch pipeline as the head pipeline' do
    let!(:pipeline) do
      create(:ci_pipeline,
        ref: merge_request.source_branch,
        sha: merge_request.source_branch_sha,
        project: merge_request.source_project)
    end

    before do
      merge_request.update_head_pipeline
      visit project_merge_request_path(project, merge_request)
    end

    it 'shows head pipeline information' do
      within '.ci-widget-content' do
Mike Scott's avatar
Mike Scott committed
163
        expect(page).to have_content("Pipeline ##{pipeline.id} (##{pipeline.iid}) pending " \
164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
                                     "for #{pipeline.short_sha} " \
                                     "on #{pipeline.ref}")
      end
    end
  end

  context 'when merge request has a detached merge request pipeline as the head pipeline' do
    let(:merge_request) do
      create(:merge_request,
        :with_detached_merge_request_pipeline,
        source_project: source_project,
        target_project: target_project)
    end

    let!(:pipeline) do
      merge_request.all_pipelines.last
    end

    let(:source_project) { project }
    let(:target_project) { project }

    before do
      merge_request.update_head_pipeline
      visit project_merge_request_path(project, merge_request)
    end

    it 'shows head pipeline information' do
      within '.ci-widget-content' do
Mike Scott's avatar
Mike Scott committed
192
        expect(page).to have_content("Pipeline ##{pipeline.id} (##{pipeline.iid}) pending " \
193 194 195 196 197 198 199 200 201 202 203
                                     "for #{pipeline.short_sha} " \
                                     "on #{merge_request.to_reference} " \
                                     "with #{merge_request.source_branch}")
      end
    end

    context 'when source project is a forked project' do
      let(:source_project) { fork_project(project, user, repository: true) }

      it 'shows head pipeline information' do
        within '.ci-widget-content' do
Mike Scott's avatar
Mike Scott committed
204
          expect(page).to have_content("Pipeline ##{pipeline.id} (##{pipeline.iid}) pending " \
205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236
                                       "for #{pipeline.short_sha} " \
                                       "on #{merge_request.to_reference} " \
                                       "with #{merge_request.source_branch}")
        end
      end
    end
  end

  context 'when merge request has a merge request pipeline as the head pipeline' do
    let(:merge_request) do
      create(:merge_request,
        :with_merge_request_pipeline,
        source_project: source_project,
        target_project: target_project,
        merge_sha: merge_sha)
    end

    let!(:pipeline) do
      merge_request.all_pipelines.last
    end

    let(:source_project) { project }
    let(:target_project) { project }
    let(:merge_sha) { project.commit.sha }

    before do
      merge_request.update_head_pipeline
      visit project_merge_request_path(project, merge_request)
    end

    it 'shows head pipeline information' do
      within '.ci-widget-content' do
Mike Scott's avatar
Mike Scott committed
237
        expect(page).to have_content("Pipeline ##{pipeline.id} (##{pipeline.iid}) pending " \
238 239 240 241 242 243 244 245 246 247 248 249 250
                                     "for #{pipeline.short_sha} " \
                                     "on #{merge_request.to_reference} " \
                                     "with #{merge_request.source_branch} " \
                                     "into #{merge_request.target_branch}")
      end
    end

    context 'when source project is a forked project' do
      let(:source_project) { fork_project(project, user, repository: true) }
      let(:merge_sha) { source_project.commit.sha }

      it 'shows head pipeline information' do
        within '.ci-widget-content' do
Mike Scott's avatar
Mike Scott committed
251
          expect(page).to have_content("Pipeline ##{pipeline.id} (##{pipeline.iid}) pending " \
252 253 254 255 256 257 258 259 260
                                       "for #{pipeline.short_sha} " \
                                       "on #{merge_request.to_reference} " \
                                       "with #{merge_request.source_branch} " \
                                       "into #{merge_request.target_branch}")
        end
      end
    end
  end

261 262 263 264 265 266 267
  context 'view merge request with MWBS button' do
    before do
      commit_status = create(:commit_status, project: project, status: 'pending')
      pipeline = create(:ci_pipeline, project: project,
                                      sha: merge_request.diff_head_sha,
                                      ref: merge_request.source_branch,
                                      status: 'pending',
268 269
                                      statuses: [commit_status],
                                      head_pipeline_of: merge_request)
270 271
      create(:ci_build, :pending, pipeline: pipeline)

272
      visit project_merge_request_path(project, merge_request)
273 274 275 276
    end

    it 'has info button when MWBS button' do
      # Wait for the `ci_status` and `merge_check` requests
277
      wait_for_requests
Fatih Acet's avatar
Fatih Acet committed
278 279 280 281
      expect(page).to have_selector('.accept-merge-request.btn-info')
    end
  end

282
  context 'view merge request where project has CI set up but no CI status' do
283 284 285 286 287 288 289 290 291 292 293 294 295
    before do
      pipeline = create(:ci_pipeline, project: project,
                                      sha: merge_request.diff_head_sha,
                                      ref: merge_request.source_branch)
      create(:ci_build, pipeline: pipeline)

      visit project_merge_request_path(project, merge_request)
    end

    it 'has pipeline error text' do
      # Wait for the `ci_status` and `merge_check` requests
      wait_for_requests

296
      expect(page).to have_text("Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.")
297 298 299
    end
  end

300
  context 'view merge request in project with only-mwps setting enabled but no CI is set up' do
301 302 303 304
    before do
      visit project_merge_request_path(project_only_mwps, merge_request_in_only_mwps_project)
    end

305
    it 'is allowed to merge' do
306 307 308 309 310 311 312 313
      # Wait for the `ci_status` and `merge_check` requests
      wait_for_requests

      expect(page).to have_selector('.accept-merge-request')
      expect(find('.accept-merge-request')['disabled']).not_to be(true)
    end
  end

Fatih Acet's avatar
Fatih Acet committed
314 315 316
  context 'view merge request with MWPS enabled but automatically merge fails' do
    before do
      merge_request.update(
317 318
        auto_merge_enabled: true,
        auto_merge_strategy: AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS,
Fatih Acet's avatar
Fatih Acet committed
319 320 321 322
        merge_user: merge_request.author,
        merge_error: 'Something went wrong'
      )

323
      visit project_merge_request_path(project, merge_request)
Fatih Acet's avatar
Fatih Acet committed
324 325 326 327
    end

    it 'shows information about the merge error' do
      # Wait for the `ci_status` and `merge_check` requests
328
      wait_for_requests
Fatih Acet's avatar
Fatih Acet committed
329 330 331 332

      page.within('.mr-widget-body') do
        expect(page).to have_content('Something went wrong')
      end
333
    end
334
  end
335

336 337 338 339 340 341 342 343
  context 'view merge request with MWPS enabled but automatically merge fails' do
    before do
      merge_request.update(
        merge_when_pipeline_succeeds: true,
        merge_user: merge_request.author,
        merge_error: 'Something went wrong'
      )

344
      visit project_merge_request_path(project, merge_request)
345 346 347 348
    end

    it 'shows information about the merge error' do
      # Wait for the `ci_status` and `merge_check` requests
349
      wait_for_requests
350 351 352 353 354 355 356

      page.within('.mr-widget-body') do
        expect(page).to have_content('Something went wrong')
      end
    end
  end

357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378
  context 'view merge request where fast-forward merge is not possible' do
    before do
      project.update(merge_requests_ff_only_enabled: true)

      merge_request.update(
        merge_user: merge_request.author,
        merge_status: :cannot_be_merged
      )

      visit project_merge_request_path(project, merge_request)
    end

    it 'shows information about the merge error' do
      # Wait for the `ci_status` and `merge_check` requests
      wait_for_requests

      page.within('.mr-widget-body') do
        expect(page).to have_content('Fast-forward merge is not possible')
      end
    end
  end

379 380 381
  context 'merge error' do
    before do
      allow_any_instance_of(Repository).to receive(:merge).and_return(false)
382
      visit project_merge_request_path(project, merge_request)
383 384 385
    end

    it 'updates the MR widget' do
Fatih Acet's avatar
Fatih Acet committed
386 387
      click_button 'Merge'

388 389 390 391 392
      page.within('.mr-widget-body') do
        expect(page).to have_content('Conflicts detected during merge')
      end
    end
  end
393

394
  context 'user can merge into source project but cannot push to fork', :js do
395
    let(:fork_project) { create(:project, :public, :repository) }
396 397 398
    let(:user2) { create(:user) }

    before do
399
      project.add_maintainer(user2)
400 401
      sign_out(:user)
      sign_in(user2)
402
      merge_request.update(target_project: fork_project)
403
      visit project_merge_request_path(project, merge_request)
404 405 406 407 408 409 410
    end

    it 'user can merge into the source project' do
      expect(page).to have_button('Merge', disabled: false)
    end

    it 'user cannot remove source branch' do
411
      expect(page).not_to have_field('remove-source-branch-input')
412 413
    end
  end
414

415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432
  context 'user cannot merge project and cannot push to fork', :js do
    let(:forked_project) { fork_project(project, nil, repository: true) }
    let(:user2) { create(:user) }

    before do
      project.add_developer(user2)
      sign_out(:user)
      sign_in(user2)
      merge_request.update(
        source_project: forked_project,
        target_project: project,
        merge_params: { 'force_remove_source_branch' => '1' }
      )
      visit project_merge_request_path(project, merge_request)
    end

    it 'user cannot remove source branch' do
      expect(page).not_to have_field('remove-source-branch-input')
433
      expect(page).to have_content('Deletes source branch')
434 435 436
    end
  end

437 438 439 440 441 442 443 444 445 446 447 448
  context 'ongoing merge process' do
    it 'shows Merging state' do
      allow_any_instance_of(MergeRequest).to receive(:merge_ongoing?).and_return(true)

      visit project_merge_request_path(project, merge_request)

      wait_for_requests

      expect(page).not_to have_button('Merge')
      expect(page).to have_content('This merge request is in the process of being merged')
    end
  end
449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 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 532 533 534 535 536 537 538 539 540 541 542 543 544 545

  context 'when merge request has test reports' do
    let!(:head_pipeline) do
      create(:ci_pipeline,
             :success,
             project: project,
             ref: merge_request.source_branch,
             sha: merge_request.diff_head_sha)
    end

    let!(:build) { create(:ci_build, :success, pipeline: head_pipeline, project: project) }

    before do
      merge_request.update!(head_pipeline_id: head_pipeline.id)
    end

    context 'when result has not been parsed yet' do
      let!(:job_artifact) { create(:ci_job_artifact, :junit, job: build, project: project) }

      before do
        visit project_merge_request_path(project, merge_request)
      end

      it 'shows parsing status' do
        expect(page).to have_content('Test summary results are being parsed')
      end
    end

    context 'when result has already been parsed' do
      context 'when JUnit xml is correctly formatted' do
        let!(:job_artifact) { create(:ci_job_artifact, :junit, job: build, project: project) }

        before do
          allow_any_instance_of(MergeRequest).to receive(:compare_test_reports).and_return(compared_data)

          visit project_merge_request_path(project, merge_request)
        end

        it 'shows parsed results' do
          expect(page).to have_content('Test summary contained')
        end
      end

      context 'when JUnit xml is corrupted' do
        let!(:job_artifact) { create(:ci_job_artifact, :junit_with_corrupted_data, job: build, project: project) }

        before do
          allow_any_instance_of(MergeRequest).to receive(:compare_test_reports).and_return(compared_data)

          visit project_merge_request_path(project, merge_request)
        end

        it 'shows the error state' do
          expect(page).to have_content('Test summary failed loading results')
        end
      end

      def compared_data
        Ci::CompareTestReportsService.new(project).execute(nil, head_pipeline)
      end
    end

    context 'when test reports have been parsed correctly' do
      let(:serialized_data) do
        {
          status: :parsed,
          data: TestReportsComparerSerializer
            .new(project: project)
            .represent(comparer)
        }
      end

      before do
        allow_any_instance_of(MergeRequest)
          .to receive(:has_test_reports?).and_return(true)
        allow_any_instance_of(MergeRequest)
          .to receive(:compare_test_reports).and_return(serialized_data)

        visit project_merge_request_path(project, merge_request)
      end

      context 'when a new failures exists' do
        let(:base_reports) do
          Gitlab::Ci::Reports::TestReports.new.tap do |reports|
            reports.get_suite('rspec').add_test_case(create_test_case_rspec_success)
            reports.get_suite('junit').add_test_case(create_test_case_java_success)
          end
        end

        let(:head_reports) do
          Gitlab::Ci::Reports::TestReports.new.tap do |reports|
            reports.get_suite('rspec').add_test_case(create_test_case_rspec_success)
            reports.get_suite('junit').add_test_case(create_test_case_java_failed)
          end
        end

        it 'shows test reports summary which includes the new failure' do
546
          within(".js-reports-container") do
547 548 549 550 551 552 553 554 555 556 557 558 559 560
            click_button 'Expand'

            expect(page).to have_content('Test summary contained 1 failed test result out of 2 total tests')
            within(".js-report-section-container") do
              expect(page).to have_content('rspec found no changed test results out of 1 total test')
              expect(page).to have_content('junit found 1 failed test result out of 1 total test')
              expect(page).to have_content('New')
              expect(page).to have_content('subtractTest')
            end
          end
        end

        context 'when user clicks the new failure' do
          it 'shows the test report detail' do
561
            within(".js-reports-container") do
562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590
              click_button 'Expand'

              within(".js-report-section-container") do
                click_button 'subtractTest'

                expect(page).to have_content('6.66')
                expect(page).to have_content(sample_java_failed_message)
              end
            end
          end
        end
      end

      context 'when an existing failure exists' do
        let(:base_reports) do
          Gitlab::Ci::Reports::TestReports.new.tap do |reports|
            reports.get_suite('rspec').add_test_case(create_test_case_rspec_failed)
            reports.get_suite('junit').add_test_case(create_test_case_java_success)
          end
        end

        let(:head_reports) do
          Gitlab::Ci::Reports::TestReports.new.tap do |reports|
            reports.get_suite('rspec').add_test_case(create_test_case_rspec_failed)
            reports.get_suite('junit').add_test_case(create_test_case_java_success)
          end
        end

        it 'shows test reports summary which includes the existing failure' do
591
          within(".js-reports-container") do
592 593 594 595 596 597 598 599 600 601 602 603 604 605
            click_button 'Expand'

            expect(page).to have_content('Test summary contained 1 failed test result out of 2 total tests')
            within(".js-report-section-container") do
              expect(page).to have_content('rspec found 1 failed test result out of 1 total test')
              expect(page).to have_content('junit found no changed test results out of 1 total test')
              expect(page).not_to have_content('New')
              expect(page).to have_content('Test#sum when a is 2 and b is 2 returns summary')
            end
          end
        end

        context 'when user clicks the existing failure' do
          it 'shows test report detail of it' do
606
            within(".js-reports-container") do
607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641
              click_button 'Expand'

              within(".js-report-section-container") do
                click_button 'Test#sum when a is 2 and b is 2 returns summary'

                expect(page).to have_content('2.22')
                expect(page).to have_content(sample_rspec_failed_message)
              end
            end
          end
        end
      end

      context 'when a resolved failure exists' do
        let(:base_reports) do
          Gitlab::Ci::Reports::TestReports.new.tap do |reports|
            reports.get_suite('rspec').add_test_case(create_test_case_rspec_success)
            reports.get_suite('junit').add_test_case(create_test_case_java_failed)
          end
        end

        let(:head_reports) do
          Gitlab::Ci::Reports::TestReports.new.tap do |reports|
            reports.get_suite('rspec').add_test_case(create_test_case_rspec_success)
            reports.get_suite('junit').add_test_case(create_test_case_java_resolved)
          end
        end

        let(:create_test_case_java_resolved) do
          create_test_case_java_failed.tap do |test_case|
            test_case.instance_variable_set("@status", Gitlab::Ci::Reports::TestCase::STATUS_SUCCESS)
          end
        end

        it 'shows test reports summary which includes the resolved failure' do
642
          within(".js-reports-container") do
643 644 645 646 647 648 649 650 651 652 653 654 655
            click_button 'Expand'

            expect(page).to have_content('Test summary contained 1 fixed test result out of 2 total tests')
            within(".js-report-section-container") do
              expect(page).to have_content('rspec found no changed test results out of 1 total test')
              expect(page).to have_content('junit found 1 fixed test result out of 1 total test')
              expect(page).to have_content('subtractTest')
            end
          end
        end

        context 'when user clicks the resolved failure' do
          it 'shows test report detail of it' do
656
            within(".js-reports-container") do
657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673
              click_button 'Expand'

              within(".js-report-section-container") do
                click_button 'subtractTest'

                expect(page).to have_content('6.66')
              end
            end
          end
        end
      end

      def comparer
        Gitlab::Ci::Reports::TestReportsComparer.new(base_reports, head_reports)
      end
    end
  end
674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695

  context 'when MR has pipeline but user does not have permission' do
    let(:sha) { project.commit(merge_request.source_branch).sha }
    let!(:pipeline) { create(:ci_pipeline_without_jobs, status: 'success', sha: sha, project: project, ref: merge_request.source_branch) }

    before do
      project.update(
        visibility_level: Gitlab::VisibilityLevel::PUBLIC,
        public_builds: false
      )
      merge_request.update!(head_pipeline: pipeline)
      sign_out(:user)

      visit project_merge_request_path(project, merge_request)
    end

    it 'renders a CI pipeline error' do
      within '.ci-widget' do
        expect(page).to have_content('Could not retrieve the pipeline status.')
      end
    end
  end
696
end