merge_requests_controller_spec.rb 48.6 KB
Newer Older
1 2
require 'spec_helper'

3
describe Projects::MergeRequestsController do
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
4
  let(:project) { create(:project) }
5
  let(:user)    { project.owner }
6
  let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
7
  let(:merge_request_with_conflicts) do
8
    create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start', source_project: project) do |mr|
9 10 11
      mr.mark_as_unmergeable
    end
  end
12 13 14 15 16

  before do
    sign_in(user)
  end

Sean McGivern's avatar
Sean McGivern committed
17
  describe 'GET new' do
18 19 20 21
    context 'merge request that removes a submodule' do
      render_views

      let(:fork_project) { create(:forked_project_with_submodules) }
22
      before { fork_project.team << [user, :master] }
23

24 25 26 27 28 29
      context 'when rendering HTML response' do
        it 'renders new merge request widget template' do
          submit_new_merge_request

          expect(response).to be_success
        end
30 31
      end

32
      context 'when rendering JSON response' do
33 34 35 36 37 38
        before do
          create(:ci_pipeline, sha: fork_project.commit('remove-submodule').id,
                               ref: 'remove-submodule',
                               project: fork_project)
        end

39 40
        it 'renders JSON including serialized pipelines' do
          submit_new_merge_request(format: :json)
41

42
          expect(response).to be_ok
43 44
          expect(json_response).to have_key 'pipelines'
          expect(json_response['pipelines']).not_to be_empty
45
        end
46 47
      end
    end
48 49 50 51

    def submit_new_merge_request(format: :html)
      get :new,
          namespace_id: fork_project.namespace.to_param,
52
          project_id: fork_project,
53 54
          merge_request: {
            source_branch: 'remove-submodule',
55 56
            target_branch: 'master'
          },
57 58
          format: format
    end
59 60
  end

61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118
  describe 'POST #create' do
    def create_merge_request(overrides = {})
      params = {
        namespace_id: project.namespace.to_param,
        project_id: project.to_param,
        merge_request: {
          title: 'Test',
          source_branch: 'feature_conflict',
          target_branch: 'master',
          author: user
        }.merge(overrides)
      }

      post :create, params
    end

    context 'the approvals_before_merge param' do
      before { project.update_attributes(approvals_before_merge: 2) }
      let(:created_merge_request) { assigns(:merge_request) }

      context 'when it is less than the one in the target project' do
        before { create_merge_request(approvals_before_merge: 1) }

        it 'sets the param to nil' do
          expect(created_merge_request.approvals_before_merge).to eq(nil)
        end

        it 'creates the merge request' do
          expect(created_merge_request).to be_valid
          expect(response).to redirect_to(namespace_project_merge_request_path(id: created_merge_request.iid, project_id: project.to_param))
        end
      end

      context 'when it is equal to the one in the target project' do
        before { create_merge_request(approvals_before_merge: 2) }

        it 'sets the param to nil' do
          expect(created_merge_request.approvals_before_merge).to eq(nil)
        end

        it 'creates the merge request' do
          expect(created_merge_request).to be_valid
          expect(response).to redirect_to(namespace_project_merge_request_path(id: created_merge_request.iid, project_id: project.to_param))
        end
      end

      context 'when it is greater than the one in the target project' do
        before { create_merge_request(approvals_before_merge: 3) }

        it 'saves the param in the merge request' do
          expect(created_merge_request.approvals_before_merge).to eq(3)
        end

        it 'creates the merge request' do
          expect(created_merge_request).to be_valid
          expect(response).to redirect_to(namespace_project_merge_request_path(id: created_merge_request.iid, project_id: project.to_param))
        end
      end
119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137

      context 'when the target project is a fork of a deleted project' do
        before do
          original_project = create(:empty_project)
          project.update_attributes(forked_from_project: original_project, approvals_before_merge: 4)
          original_project.update_attributes(pending_delete: true)

          create_merge_request(approvals_before_merge: 3)
        end

        it 'uses the default from the target project' do
          expect(created_merge_request.approvals_before_merge).to eq(nil)
        end

        it 'creates the merge request' do
          expect(created_merge_request).to be_valid
          expect(response).to redirect_to(namespace_project_merge_request_path(id: created_merge_request.iid, project_id: project.to_param))
        end
      end
138 139 140 141 142 143
    end

    context 'when the merge request is invalid' do
      it 'shows the #new form' do
        expect(create_merge_request(title: nil)).to render_template(:new)
      end
144 145 146
    end
  end

http://jneen.net/'s avatar
http://jneen.net/ committed
147
  context 'approvals' do
http://jneen.net/'s avatar
http://jneen.net/ committed
148
    def json_response
Douwe Maan's avatar
Douwe Maan committed
149
      JSON.parse(response.body)
http://jneen.net/'s avatar
http://jneen.net/ committed
150 151 152 153 154 155 156
    end

    let(:approver) { create(:user) }

    before do
      merge_request.update_attribute :approvals_before_merge, 2
      project.team << [approver, :developer]
157
      project.approver_ids = [user, approver].map(&:id).join(',')
http://jneen.net/'s avatar
http://jneen.net/ committed
158 159
    end

http://jneen.net/'s avatar
http://jneen.net/ committed
160 161 162 163 164
    describe 'approve' do
      before do
        post :approve,
          namespace_id: project.namespace.to_param,
          project_id: project.to_param,
http://jneen.net/'s avatar
http://jneen.net/ committed
165 166
          id: merge_request.iid,
          format: :json
http://jneen.net/'s avatar
http://jneen.net/ committed
167 168
      end

http://jneen.net/'s avatar
http://jneen.net/ committed
169
      it 'approves the merge request' do
http://jneen.net/'s avatar
http://jneen.net/ committed
170
        expect(response).to be_success
http://jneen.net/'s avatar
http://jneen.net/ committed
171 172 173 174 175
        expect(json_response['approvals_left']).to eq 1
        expect(json_response['approved_by'].size).to eq 1
        expect(json_response['approved_by'][0]['user']['username']).to eq user.username
        expect(json_response['user_has_approved']).to be true
        expect(json_response['user_can_approve']).to be false
176 177
        expect(json_response['suggested_approvers'].size).to eq 1
        expect(json_response['suggested_approvers'][0]['username']).to eq approver.username
http://jneen.net/'s avatar
http://jneen.net/ committed
178 179 180 181 182 183 184 185 186 187 188
      end
    end

    describe 'approvals' do
      before do
        merge_request.approvals.create(user: approver)
        get :approvals,
          namespace_id: project.namespace.to_param,
          project_id: project.to_param,
          id: merge_request.iid,
          format: :json
http://jneen.net/'s avatar
http://jneen.net/ committed
189 190
      end

http://jneen.net/'s avatar
http://jneen.net/ committed
191 192 193 194 195 196 197
      it 'shows approval information' do
        expect(response).to be_success
        expect(json_response['approvals_left']).to eq 1
        expect(json_response['approved_by'].size).to eq 1
        expect(json_response['approved_by'][0]['user']['username']).to eq approver.username
        expect(json_response['user_has_approved']).to be false
        expect(json_response['user_can_approve']).to be true
198 199
        expect(json_response['suggested_approvers'].size).to eq 1
        expect(json_response['suggested_approvers'][0]['username']).to eq user.username
http://jneen.net/'s avatar
http://jneen.net/ committed
200
      end
http://jneen.net/'s avatar
http://jneen.net/ committed
201 202
    end

http://jneen.net/'s avatar
http://jneen.net/ committed
203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218
    describe 'unapprove' do
      before do
        merge_request.approvals.create(user: user)
        delete :unapprove,
          namespace_id: project.namespace.to_param,
          project_id: project.to_param,
          id: merge_request.iid,
          format: :json
      end

      it 'unapproves the merge request' do
        expect(response).to be_success
        expect(json_response['approvals_left']).to eq 2
        expect(json_response['approved_by']).to be_empty
        expect(json_response['user_has_approved']).to be false
        expect(json_response['user_can_approve']).to be true
219
        expect(json_response['suggested_approvers'].size).to eq 2
http://jneen.net/'s avatar
http://jneen.net/ committed
220 221
      end
    end
http://jneen.net/'s avatar
http://jneen.net/ committed
222 223
  end

224 225 226 227 228 229 230 231 232 233 234 235
  describe 'GET commit_change_content' do
    it 'renders commit_change_content template' do
      get :commit_change_content,
        namespace_id: project.namespace.to_param,
        project_id: project,
        id: merge_request.iid,
        format: 'html'

      expect(response).to render_template('_commit_change_content')
    end
  end

236 237 238 239
  shared_examples "loads labels" do |action|
    it "loads labels into the @labels variable" do
      get action,
          namespace_id: project.namespace.to_param,
240
          project_id: project,
241 242 243
          id: merge_request.iid,
          format: 'html'
      expect(assigns(:labels)).not_to be_nil
244 245 246
    end
  end

Sean McGivern's avatar
Sean McGivern committed
247
  describe "GET show" do
248 249 250 251 252 253
    def go(extra_params = {})
      params = {
        namespace_id: project.namespace.to_param,
        project_id: project,
        id: merge_request.iid
      }
254

255 256
      get :show, params.merge(extra_params)
    end
257

258
    it_behaves_like "loads labels", :show
259

260 261 262
    describe 'as html' do
      it "renders merge request page" do
        go(format: :html)
263

264
        expect(response).to be_success
265
      end
266
    end
267

268 269 270 271
    describe 'as json' do
      context 'with basic param' do
        it 'renders basic MR entity as json' do
          go(basic: true, format: :json)
272

273 274
          expect(response).to match_response_schema('entities/merge_request_basic')
        end
275 276
      end

277 278 279
      context 'without basic param' do
        it 'renders the merge request in the json format' do
          go(format: :json)
280

281 282
          expect(response).to match_response_schema('entities/merge_request')
        end
283
      end
284

285
      context 'number of queries', :request_store do
286 287 288 289 290 291
        it 'verifies number of queries' do
          # pre-create objects
          merge_request

          recorded = ActiveRecord::QueryRecorder.new { go(format: :json) }

292
          expect(recorded.count).to be_within(5).of(30)
293
          expect(recorded.cached_count).to eq(0)
294
        end
295 296 297 298
      end
    end

    describe "as diff" do
299
      it "triggers workhorse to serve the request" do
300
        go(format: :diff)
301

Douwe Maan's avatar
Douwe Maan committed
302
        expect(response.headers[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-diff:")
303 304 305 306
      end
    end

    describe "as patch" do
307
      it 'triggers workhorse to serve the request' do
308
        go(format: :patch)
309

Douwe Maan's avatar
Douwe Maan committed
310
        expect(response.headers[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-format-patch:")
311 312 313
      end
    end
  end
314

Sean McGivern's avatar
Sean McGivern committed
315
  describe 'GET index' do
316 317
    let!(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }

318
    def get_merge_requests(page = nil)
319 320
      get :index,
          namespace_id: project.namespace.to_param,
321
          project_id: project,
322 323 324
          state: 'opened', page: page.to_param
    end

325 326
    it_behaves_like "issuables list meta-data", :merge_request

327
    context 'when page param' do
328 329 330
      let(:last_page) { project.merge_requests.page().total_pages }
      let!(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }

331 332 333
      it 'redirects to last_page if page number is larger than number of pages' do
        get_merge_requests(last_page + 1)

334
        expect(response).to redirect_to(namespace_project_merge_requests_path(page: last_page, state: controller.params[:state], scope: controller.params[:scope]))
335 336 337 338 339 340 341 342
      end

      it 'redirects to specified page' do
        get_merge_requests(last_page)

        expect(assigns(:merge_requests).current_page).to eq(last_page)
        expect(response).to have_http_status(200)
      end
343 344 345 346 347 348 349 350 351 352 353 354

      it 'does not redirect to external sites when provided a host field' do
        external_host = "www.example.com"
        get :index,
          namespace_id: project.namespace.to_param,
          project_id: project,
          state: 'opened',
          page: (last_page + 1).to_param,
          host: external_host

        expect(response).to redirect_to(namespace_project_merge_requests_path(page: last_page, state: controller.params[:state], scope: controller.params[:scope]))
      end
355 356 357 358
    end

    context 'when filtering by opened state' do
      context 'with opened merge requests' do
359
        it 'lists those merge requests' do
360 361 362 363 364 365 366 367 368 369 370 371
          get_merge_requests

          expect(assigns(:merge_requests)).to include(merge_request)
        end
      end

      context 'with reopened merge requests' do
        before do
          merge_request.close!
          merge_request.reopen!
        end

372
        it 'lists those merge requests' do
373 374 375 376 377 378 379 380
          get_merge_requests

          expect(assigns(:merge_requests)).to include(merge_request)
        end
      end
    end
  end

Sean McGivern's avatar
Sean McGivern committed
381
  describe 'PUT update' do
382 383 384 385 386 387
    def update_merge_request(params = {})
      post :update,
           namespace_id: project.namespace.to_param,
           project_id: project.to_param,
           id: merge_request.iid,
           merge_request: params
388 389
    end

390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405
    context 'changing the assignee' do
      it 'limits the attributes exposed on the assignee' do
        assignee = create(:user)
        project.add_developer(assignee)

        put :update,
          namespace_id: project.namespace.to_param,
          project_id: project,
          id: merge_request.iid,
          merge_request: { assignee_id: assignee.id },
          format: :json
        body = JSON.parse(response.body)

        expect(body['assignee'].keys)
          .to match_array(%w(name username avatar_url))
      end
406 407
    end

408
    context 'there is no source project' do
409 410 411
      let(:project)       { create(:project) }
      let(:fork_project)  { create(:forked_project_with_submodules) }
      let(:merge_request) { create(:merge_request, source_project: fork_project, source_branch: 'add-submodule-version-bump', target_branch: 'master', target_project: project) }
412 413 414 415 416

      before do
        fork_project.build_forked_project_link(forked_to_project_id: fork_project.id, forked_from_project_id: project.id)
        fork_project.save
        merge_request.reload
417
        fork_project.destroy
418 419 420
      end

      it 'closes MR without errors' do
421
        update_merge_request(state_event: 'close')
422 423 424 425

        expect(response).to redirect_to([merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request])
        expect(merge_request.reload.closed?).to be_truthy
      end
426

Katarzyna Kobierska's avatar
Katarzyna Kobierska committed
427
      it 'allows editing of a closed merge request' do
428 429 430
        merge_request.close!

        put :update,
431 432
            namespace_id: project.namespace,
            project_id: project,
433 434 435 436 437 438 439 440 441
            id: merge_request.iid,
            merge_request: {
              title: 'New title'
            }

        expect(response).to redirect_to([merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request])
        expect(merge_request.reload.title).to eq 'New title'
      end

Katarzyna Kobierska's avatar
Katarzyna Kobierska committed
442
      it 'does not allow to update target branch closed merge request' do
443 444 445
        merge_request.close!

        put :update,
446 447
            namespace_id: project.namespace,
            project_id: project,
448 449 450 451 452 453 454
            id: merge_request.iid,
            merge_request: {
              target_branch: 'new_branch'
            }

        expect { merge_request.reload.target_branch }.not_to change { merge_request.target_branch }
      end
455 456

      it_behaves_like 'update invalid issuable', MergeRequest
457
    end
458

459 460 461 462 463 464
    context 'when the merge request requires approval' do
      before { project.update_attributes(approvals_before_merge: 1) }

      it_behaves_like 'update invalid issuable', MergeRequest
    end

465 466 467
    context 'the approvals_before_merge param' do
      before { project.update_attributes(approvals_before_merge: 2) }

468 469 470 471 472 473 474 475 476 477 478 479 480
      context 'approvals_before_merge not set for the existing MR' do
        context 'when it is less than the one in the target project' do
          before { update_merge_request(approvals_before_merge: 1) }

          it 'sets the param to nil' do
            expect(merge_request.reload.approvals_before_merge).to eq(nil)
          end

          it 'updates the merge request' do
            expect(merge_request.reload).to be_valid
            expect(response).to redirect_to(namespace_project_merge_request_path(id: merge_request.iid, project_id: project.to_param))
          end
        end
481

482 483 484 485 486 487 488 489 490 491 492
        context 'when it is equal to the one in the target project' do
          before { update_merge_request(approvals_before_merge: 2) }

          it 'sets the param to nil' do
            expect(merge_request.reload.approvals_before_merge).to eq(nil)
          end

          it 'updates the merge request' do
            expect(merge_request.reload).to be_valid
            expect(response).to redirect_to(namespace_project_merge_request_path(id: merge_request.iid, project_id: project.to_param))
          end
493 494
        end

495 496 497 498 499 500 501 502 503 504 505
        context 'when it is greater than the one in the target project' do
          before { update_merge_request(approvals_before_merge: 3) }

          it 'saves the param in the merge request' do
            expect(merge_request.reload.approvals_before_merge).to eq(3)
          end

          it 'updates the merge request' do
            expect(merge_request.reload).to be_valid
            expect(response).to redirect_to(namespace_project_merge_request_path(id: merge_request.iid, project_id: project.to_param))
          end
506 507 508
        end
      end

509
      context 'approvals_before_merge set for the existing MR' do
510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527
        before do
          merge_request.update_attribute(:approvals_before_merge, 4)
        end

        context 'when it is not set' do
          before do
            update_merge_request(title: 'New title')
          end

          it 'does not change the merge request' do
            expect(merge_request.reload.approvals_before_merge).to eq(4)
          end

          it 'updates the merge request' do
            expect(merge_request.reload).to be_valid
            expect(response).to redirect_to(namespace_project_merge_request_path(id: merge_request.iid, project_id: project.to_param))
          end
        end
528

529 530 531 532 533 534
        context 'when it is less than the one in the target project' do
          before { update_merge_request(approvals_before_merge: 1) }

          it 'sets the param to nil' do
            expect(merge_request.reload.approvals_before_merge).to eq(nil)
          end
535

536 537 538 539
          it 'updates the merge request' do
            expect(merge_request.reload).to be_valid
            expect(response).to redirect_to(namespace_project_merge_request_path(id: merge_request.iid, project_id: project.to_param))
          end
540 541
        end

542 543
        context 'when it is equal to the one in the target project' do
          before { update_merge_request(approvals_before_merge: 2) }
544

545 546 547 548 549 550 551 552
          it 'sets the param to nil' do
            expect(merge_request.reload.approvals_before_merge).to eq(nil)
          end

          it 'updates the merge request' do
            expect(merge_request.reload).to be_valid
            expect(response).to redirect_to(namespace_project_merge_request_path(id: merge_request.iid, project_id: project.to_param))
          end
553 554
        end

555 556 557 558 559 560 561 562 563 564 565
        context 'when it is greater than the one in the target project' do
          before { update_merge_request(approvals_before_merge: 3) }

          it 'saves the param in the merge request' do
            expect(merge_request.reload.approvals_before_merge).to eq(3)
          end

          it 'updates the merge request' do
            expect(merge_request.reload).to be_valid
            expect(response).to redirect_to(namespace_project_merge_request_path(id: merge_request.iid, project_id: project.to_param))
          end
566 567 568
        end
      end
    end
569 570
  end

Sean McGivern's avatar
Sean McGivern committed
571
  describe 'POST merge' do
572 573
    let(:base_params) do
      {
574 575
        namespace_id: project.namespace,
        project_id: project,
576
        id: merge_request.iid,
Sean McGivern's avatar
Sean McGivern committed
577
        squash: false,
578
        format: 'json'
579 580 581
      }
    end

582
    context 'when user cannot access' do
583 584
      let(:user) { create(:user) }

585
      before do
586 587
        project.add_reporter(user)
        xhr :post, :merge, base_params
588 589
      end

590 591
      it 'returns 404' do
        expect(response).to have_http_status(404)
592 593 594 595 596 597 598 599 600 601 602
      end
    end

    context 'when the merge request is not mergeable' do
      before do
        merge_request.update_attributes(title: "WIP: #{merge_request.title}")

        post :merge, base_params
      end

      it 'returns :failed' do
603
        expect(json_response).to eq('status' => 'failed')
604 605 606 607 608 609 610
      end
    end

    context 'when the sha parameter does not match the source SHA' do
      before { post :merge, base_params.merge(sha: 'foo') }

      it 'returns :sha_mismatch' do
611
        expect(json_response).to eq('status' => 'sha_mismatch')
612 613 614 615
      end
    end

    context 'when the sha parameter matches the source SHA' do
Sean McGivern's avatar
Sean McGivern committed
616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635
      def merge_with_sha(params = {})
        post :merge, base_params.merge(sha: merge_request.diff_head_sha).merge(params)
      end

      context 'when squash is passed as 1' do
        it 'updates the squash attribute on the MR to true' do
          merge_request.update(squash: false)
          merge_with_sha(squash: '1')

          expect(merge_request.reload.squash).to be_truthy
        end
      end

      context 'when squash is passed as 1' do
        it 'updates the squash attribute on the MR to false' do
          merge_request.update(squash: true)
          merge_with_sha(squash: '0')

          expect(merge_request.reload.squash).to be_falsey
        end
636 637 638 639 640
      end

      it 'returns :success' do
        merge_with_sha

641
        expect(json_response).to eq('status' => 'success')
642 643 644 645 646 647 648 649
      end

      it 'starts the merge immediately' do
        expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, anything)

        merge_with_sha
      end

650 651 652
      context 'when the pipeline succeeds is passed' do
        def merge_when_pipeline_succeeds
          post :merge, base_params.merge(sha: merge_request.diff_head_sha, merge_when_pipeline_succeeds: '1')
653 654 655
        end

        before do
656
          create(:ci_empty_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch, head_pipeline_of: merge_request)
657 658
        end

659 660
        it 'returns :merge_when_pipeline_succeeds' do
          merge_when_pipeline_succeeds
661

662
          expect(json_response).to eq('status' => 'merge_when_pipeline_succeeds')
663 664
        end

665 666
        it 'sets the MR to merge when the pipeline succeeds' do
          service = double(:merge_when_pipeline_succeeds_service)
667

668 669 670
          expect(MergeRequests::MergeWhenPipelineSucceedsService)
            .to receive(:new).with(project, anything, anything)
            .and_return(service)
671 672
          expect(service).to receive(:execute).with(merge_request)

673
          merge_when_pipeline_succeeds
674
        end
675

676
        context 'when project.only_allow_merge_if_pipeline_succeeds? is true' do
677
          before do
678
            project.update_column(:only_allow_merge_if_pipeline_succeeds, true)
679 680
          end

681 682
          it 'returns :merge_when_pipeline_succeeds' do
            merge_when_pipeline_succeeds
683

684
            expect(json_response).to eq('status' => 'merge_when_pipeline_succeeds')
685 686
          end
        end
687
      end
688

689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704
      describe 'only_allow_merge_if_all_discussions_are_resolved? setting' do
        let(:merge_request) { create(:merge_request_with_diff_notes, source_project: project, author: user) }

        context 'when enabled' do
          before do
            project.update_column(:only_allow_merge_if_all_discussions_are_resolved, true)
          end

          context 'with unresolved discussion' do
            before do
              expect(merge_request).not_to be_discussions_resolved
            end

            it 'returns :failed' do
              merge_with_sha

705
              expect(json_response).to eq('status' => 'failed')
706 707
            end
          end
708

709 710 711 712 713
          context 'with all discussions resolved' do
            before do
              merge_request.discussions.each { |d| d.resolve!(user) }
              expect(merge_request).to be_discussions_resolved
            end
714

715 716
            it 'returns :success' do
              merge_with_sha
717

718
              expect(json_response).to eq('status' => 'success')
719
            end
720 721 722
          end
        end

723 724 725 726 727 728 729 730 731 732 733 734 735
        context 'when disabled' do
          before do
            project.update_column(:only_allow_merge_if_all_discussions_are_resolved, false)
          end

          context 'with unresolved discussion' do
            before do
              expect(merge_request).not_to be_discussions_resolved
            end

            it 'returns :success' do
              merge_with_sha

736
              expect(json_response).to eq('status' => 'success')
737 738 739 740 741 742 743 744
            end
          end

          context 'with all discussions resolved' do
            before do
              merge_request.discussions.each { |d| d.resolve!(user) }
              expect(merge_request).to be_discussions_resolved
            end
745

746 747
            it 'returns :success' do
              merge_with_sha
748

749
              expect(json_response).to eq('status' => 'success')
750
            end
751 752 753
          end
        end
      end
754 755 756
    end
  end

Sean McGivern's avatar
Sean McGivern committed
757
  describe "DELETE destroy" do
758 759
    let(:user) { create(:user) }

760
    it "denies access to users unless they're admin or project owner" do
761
      delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
762

763
      expect(response).to have_http_status(404)
764 765
    end

766 767 768 769 770 771
    context "when the user is owner" do
      let(:owner)     { create(:user) }
      let(:namespace) { create(:namespace, owner: owner) }
      let(:project)   { create(:project, namespace: namespace) }

      before { sign_in owner }
772

773
      it "deletes the merge request" do
774
        delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
775

776
        expect(response).to have_http_status(302)
777
        expect(controller).to set_flash[:notice].to(/The merge request was successfully deleted\./).now
778
      end
779 780 781 782

      it 'delegates the update of the todos count cache to TodoService' do
        expect_any_instance_of(TodoService).to receive(:destroy_merge_request).with(merge_request, owner).once

783
        delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
784
      end
785 786 787
    end
  end

788
  describe 'GET diffs' do
789 790 791
    def go(extra_params = {})
      params = {
        namespace_id: project.namespace.to_param,
792
        project_id: project,
793 794 795 796
        id: merge_request.iid
      }

      get :diffs, params.merge(extra_params)
797 798
    end

799 800
    it_behaves_like "loads labels", :diffs

801 802 803
    context 'with default params' do
      context 'as html' do
        before { go(format: 'html') }
804

805 806 807
        it 'renders the diff template' do
          expect(response).to render_template('diffs')
        end
808 809
      end

810 811
      context 'as json' do
        before { go(format: 'json') }
812

813 814
        it 'renders the diffs template to a string' do
          expect(response).to render_template('projects/merge_requests/show/_diffs')
815
          expect(json_response).to have_key('html')
816
        end
817 818
      end

819 820
      context 'with forked projects with submodules' do
        render_views
821

822 823 824
        let(:project) { create(:project) }
        let(:fork_project) { create(:forked_project_with_submodules) }
        let(:merge_request) { create(:merge_request_with_diffs, source_project: fork_project, source_branch: 'add-submodule-version-bump', target_branch: 'master', target_project: project) }
825

826 827 828 829 830 831
        before do
          fork_project.build_forked_project_link(forked_to_project_id: fork_project.id, forked_from_project_id: project.id)
          fork_project.save
          merge_request.reload
          go(format: 'json')
        end
832

833 834 835 836
        it 'renders' do
          expect(response).to be_success
          expect(response.body).to have_content('Subproject commit')
        end
837 838 839
      end
    end

840 841 842
    context 'with ignore_whitespace_change' do
      context 'as html' do
        before { go(format: 'html', w: 1) }
843

844 845 846 847 848 849 850
        it 'renders the diff template' do
          expect(response).to render_template('diffs')
        end
      end

      context 'as json' do
        before { go(format: 'json', w: 1) }
851

852 853
        it 'renders the diffs template to a string' do
          expect(response).to render_template('projects/merge_requests/show/_diffs')
854
          expect(json_response).to have_key('html')
855
        end
856 857
      end
    end
858

859 860
    context 'with view' do
      before { go(view: 'parallel') }
861

862 863
      it 'saves the preferred diff view in a cookie' do
        expect(response.cookies['diff_view']).to eq('parallel')
864 865 866 867
      end
    end
  end

Sean McGivern's avatar
Sean McGivern committed
868
  describe 'GET diff_for_path' do
869
    def diff_for_path(extra_params = {})
870 871
      params = {
        namespace_id: project.namespace.to_param,
872
        project_id: project
873 874
      }

875
      get :diff_for_path, params.merge(extra_params)
876 877
    end

878 879
    context 'when an ID param is passed' do
      let(:existing_path) { 'files/ruby/popen.rb' }
880

881 882 883 884
      context 'when the merge request exists' do
        context 'when the user can view the merge request' do
          context 'when the path exists in the diff' do
            it 'enables diff notes' do
885
              diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path)
886 887

              expect(assigns(:diff_notes_disabled)).to be_falsey
888 889
              expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'MergeRequest',
                                                          noteable_id: merge_request.id)
890 891 892
            end

            it 'only renders the diffs for the path given' do
893 894 895
              expect(controller).to receive(:render_diff_for_path).and_wrap_original do |meth, diffs|
                expect(diffs.diff_files.map(&:new_path)).to contain_exactly(existing_path)
                meth.call(diffs)
896 897
              end

898
              diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path)
899 900 901 902
            end
          end

          context 'when the path does not exist in the diff' do
903
            before { diff_for_path(id: merge_request.iid, old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb') }
904 905 906 907 908 909 910 911 912 913

            it 'returns a 404' do
              expect(response).to have_http_status(404)
            end
          end
        end

        context 'when the user cannot view the merge request' do
          before do
            project.team.truncate
914
            diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path)
915 916 917 918 919 920 921 922 923
          end

          it 'returns a 404' do
            expect(response).to have_http_status(404)
          end
        end
      end

      context 'when the merge request does not exist' do
924
        before { diff_for_path(id: merge_request.iid.succ, old_path: existing_path, new_path: existing_path) }
925 926 927 928 929 930 931 932 933 934 935

        it 'returns a 404' do
          expect(response).to have_http_status(404)
        end
      end

      context 'when the merge request belongs to a different project' do
        let(:other_project) { create(:empty_project) }

        before do
          other_project.team << [user, :master]
936
          diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path, project_id: other_project)
937 938 939 940 941 942 943 944 945 946 947 948 949
        end

        it 'returns a 404' do
          expect(response).to have_http_status(404)
        end
      end
    end

    context 'when source and target params are passed' do
      let(:existing_path) { 'files/ruby/feature.rb' }

      context 'when both branches are in the same project' do
        it 'disables diff notes' do
950
          diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
951 952 953 954 955

          expect(assigns(:diff_notes_disabled)).to be_truthy
        end

        it 'only renders the diffs for the path given' do
956 957 958
          expect(controller).to receive(:render_diff_for_path).and_wrap_original do |meth, diffs|
            expect(diffs.diff_files.map(&:new_path)).to contain_exactly(existing_path)
            meth.call(diffs)
959 960
          end

961
          diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
962 963 964 965 966 967 968 969 970 971
        end
      end

      context 'when the source branch is in a different project to the target' do
        let(:other_project) { create(:project) }

        before { other_project.team << [user, :master] }

        context 'when the path exists in the diff' do
          it 'disables diff notes' do
972
            diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
973 974 975 976 977

            expect(assigns(:diff_notes_disabled)).to be_truthy
          end

          it 'only renders the diffs for the path given' do
978 979 980
            expect(controller).to receive(:render_diff_for_path).and_wrap_original do |meth, diffs|
              expect(diffs.diff_files.map(&:new_path)).to contain_exactly(existing_path)
              meth.call(diffs)
981 982
            end

983
            diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
984 985 986 987
          end
        end

        context 'when the path does not exist in the diff' do
988
          before { diff_for_path(old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb', merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' }) }
989 990 991 992 993 994

          it 'returns a 404' do
            expect(response).to have_http_status(404)
          end
        end
      end
995 996 997
    end
  end

998 999
  describe 'GET commits' do
    def go(format: 'html')
1000 1001
      get :commits,
          namespace_id: project.namespace.to_param,
1002
          project_id: project,
1003 1004
          id: merge_request.iid,
          format: format
1005 1006
    end

1007 1008
    it_behaves_like "loads labels", :commits

1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021
    context 'as html' do
      it 'renders the show template' do
        go

        expect(response).to render_template('show')
      end
    end

    context 'as json' do
      it 'renders the commits template to a string' do
        go format: 'json'

        expect(response).to render_template('projects/merge_requests/show/_commits')
1022
        expect(json_response).to have_key('html')
1023
      end
1024 1025
    end
  end
1026

1027
  describe 'GET pipelines' do
1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041
    before do
      create(:ci_pipeline, project: merge_request.source_project,
                           ref: merge_request.source_branch,
                           sha: merge_request.diff_head_sha)
    end

    context 'when using HTML format' do
      it_behaves_like "loads labels", :pipelines
    end

    context 'when using JSON format' do
      before do
        get :pipelines,
            namespace_id: project.namespace.to_param,
1042
            project_id: project,
1043 1044 1045 1046 1047
            id: merge_request.iid,
            format: :json
      end

      it 'responds with serialized pipelines' do
1048
        expect(json_response).not_to be_empty
1049 1050
      end
    end
1051 1052
  end

1053
  describe 'GET conflicts' do
1054
    context 'when the conflicts cannot be resolved in the UI' do
1055
      before do
1056 1057
        allow_any_instance_of(Gitlab::Conflict::Parser).
          to receive(:parse).and_raise(Gitlab::Conflict::Parser::UnmergeableFile)
1058

1059 1060
        get :conflicts,
            namespace_id: merge_request_with_conflicts.project.namespace.to_param,
1061
            project_id: merge_request_with_conflicts.project,
1062 1063 1064 1065
            id: merge_request_with_conflicts.iid,
            format: 'json'
      end

1066 1067 1068 1069 1070
      it 'returns a 200 status code' do
        expect(response).to have_http_status(:ok)
      end

      it 'returns JSON with a message' do
1071
        expect(json_response.keys).to contain_exactly('message', 'type')
1072 1073 1074 1075 1076 1077 1078
      end
    end

    context 'with valid conflicts' do
      before do
        get :conflicts,
            namespace_id: merge_request_with_conflicts.project.namespace.to_param,
1079
            project_id: merge_request_with_conflicts.project,
1080 1081 1082
            id: merge_request_with_conflicts.iid,
            format: 'json'
      end
1083

Sean McGivern's avatar
Sean McGivern committed
1084 1085 1086 1087
      it 'matches the schema' do
        expect(response).to match_response_schema('conflicts')
      end

1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107
      it 'includes meta info about the MR' do
        expect(json_response['commit_message']).to include('Merge branch')
        expect(json_response['commit_sha']).to match(/\h{40}/)
        expect(json_response['source_branch']).to eq(merge_request_with_conflicts.source_branch)
        expect(json_response['target_branch']).to eq(merge_request_with_conflicts.target_branch)
      end

      it 'includes each file that has conflicts' do
        filenames = json_response['files'].map { |file| file['new_path'] }

        expect(filenames).to contain_exactly('files/ruby/popen.rb', 'files/ruby/regex.rb')
      end

      it 'splits files into sections with lines' do
        json_response['files'].each do |file|
          file['sections'].each do |section|
            expect(section).to include('conflict', 'lines')

            section['lines'].each do |line|
              if section['conflict']
Douwe Maan's avatar
Douwe Maan committed
1108
                expect(line['type']).to be_in(%w(old new))
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
                expect(line.values_at('old_line', 'new_line')).to contain_exactly(nil, a_kind_of(Integer))
              else
                if line['type'].nil?
                  expect(line['old_line']).not_to eq(nil)
                  expect(line['new_line']).not_to eq(nil)
                else
                  expect(line['type']).to eq('match')
                  expect(line['old_line']).to eq(nil)
                  expect(line['new_line']).to eq(nil)
                end
              end
            end
          end
        end
      end

      it 'has unique section IDs across files' do
        section_ids = json_response['files'].flat_map do |file|
          file['sections'].map { |section| section['id'] }.compact
        end

        expect(section_ids.uniq).to eq(section_ids)
      end
    end
  end
1134

1135 1136
  describe 'POST remove_wip' do
    before do
1137 1138 1139
      merge_request.title = merge_request.wip_title
      merge_request.save

1140 1141 1142 1143 1144 1145
      xhr :post, :remove_wip,
        namespace_id: merge_request.project.namespace.to_param,
        project_id: merge_request.project,
        id: merge_request.iid,
        format: :json
    end
1146

1147
    it 'removes the wip status' do
1148 1149
      expect(merge_request.reload.title).to eq(merge_request.wipless_title)
    end
1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183

    it 'renders MergeRequest as JSON' do
      expect(json_response.keys).to include('id', 'iid', 'description')
    end
  end

  describe 'POST cancel_merge_when_pipeline_succeeds' do
    subject do
      xhr :post, :cancel_merge_when_pipeline_succeeds,
        namespace_id: merge_request.project.namespace.to_param,
        project_id: merge_request.project,
        id: merge_request.iid,
        format: :json
    end

    it 'calls MergeRequests::MergeWhenPipelineSucceedsService' do
      mwps_service = double

      allow(MergeRequests::MergeWhenPipelineSucceedsService)
        .to receive(:new)
        .and_return(mwps_service)

      expect(mwps_service).to receive(:cancel).with(merge_request)

      subject
    end

    it { is_expected.to have_http_status(:success) }

    it 'renders MergeRequest as JSON' do
      subject

      expect(json_response.keys).to include('id', 'iid', 'description')
    end
1184 1185
  end

1186 1187 1188 1189
  describe 'GET conflict_for_path' do
    def conflict_for_path(path)
      get :conflict_for_path,
          namespace_id: merge_request_with_conflicts.project.namespace.to_param,
1190
          project_id: merge_request_with_conflicts.project,
1191 1192 1193 1194 1195 1196 1197 1198
          id: merge_request_with_conflicts.iid,
          old_path: path,
          new_path: path,
          format: 'json'
    end

    context 'when the conflicts cannot be resolved in the UI' do
      before do
1199 1200
        allow_any_instance_of(Gitlab::Conflict::Parser).
          to receive(:parse).and_raise(Gitlab::Conflict::Parser::UnmergeableFile)
1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227

        conflict_for_path('files/ruby/regex.rb')
      end

      it 'returns a 404 status code' do
        expect(response).to have_http_status(:not_found)
      end
    end

    context 'when the file does not exist cannot be resolved in the UI' do
      before { conflict_for_path('files/ruby/regexp.rb') }

      it 'returns a 404 status code' do
        expect(response).to have_http_status(:not_found)
      end
    end

    context 'with an existing file' do
      let(:path) { 'files/ruby/regex.rb' }

      before { conflict_for_path(path) }

      it 'returns a 200 status code' do
        expect(response).to have_http_status(:ok)
      end

      it 'returns the file in JSON format' do
1228 1229 1230
        content = MergeRequests::Conflicts::ListService.new(merge_request_with_conflicts).
                    file_for_path(path, path).
                    content
1231 1232 1233 1234 1235

        expect(json_response).to include('old_path' => path,
                                         'new_path' => path,
                                         'blob_icon' => 'file-text-o',
                                         'blob_path' => a_string_ending_with(path),
1236
                                         'blob_ace_mode' => 'ruby',
1237 1238
                                         'content' => content)
      end
1239 1240 1241
    end
  end

1242
  context 'POST resolve_conflicts' do
1243 1244
    let!(:original_head_sha) { merge_request_with_conflicts.diff_head_sha }

1245
    def resolve_conflicts(files)
1246 1247
      post :resolve_conflicts,
           namespace_id: merge_request_with_conflicts.project.namespace.to_param,
1248
           project_id: merge_request_with_conflicts.project,
1249 1250
           id: merge_request_with_conflicts.iid,
           format: 'json',
1251
           files: files,
1252
           commit_message: 'Commit message'
1253 1254 1255 1256
    end

    context 'with valid params' do
      before do
1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275
        resolved_files = [
          {
            'new_path' => 'files/ruby/popen.rb',
            'old_path' => 'files/ruby/popen.rb',
            'sections' => {
              '2f6fcd96b88b36ce98c38da085c795a27d92a3dd_14_14' => 'head'
            }
          }, {
            'new_path' => 'files/ruby/regex.rb',
            'old_path' => 'files/ruby/regex.rb',
            'sections' => {
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_9_9' => 'head',
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_21_21' => 'origin',
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_49_49' => 'origin'
            }
          }
        ]

        resolve_conflicts(resolved_files)
1276 1277 1278
      end

      it 'creates a new commit on the branch' do
1279
        expect(original_head_sha).not_to eq(merge_request_with_conflicts.source_branch_head.sha)
1280
        expect(merge_request_with_conflicts.source_branch_head.message).to include('Commit message')
1281 1282
      end

1283
      it 'returns an OK response' do
1284
        expect(response).to have_http_status(:ok)
1285 1286
      end
    end
1287 1288 1289

    context 'when sections are missing' do
      before do
1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306
        resolved_files = [
          {
            'new_path' => 'files/ruby/popen.rb',
            'old_path' => 'files/ruby/popen.rb',
            'sections' => {
              '2f6fcd96b88b36ce98c38da085c795a27d92a3dd_14_14' => 'head'
            }
          }, {
            'new_path' => 'files/ruby/regex.rb',
            'old_path' => 'files/ruby/regex.rb',
            'sections' => {
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_9_9' => 'head'
            }
          }
        ]

        resolve_conflicts(resolved_files)
1307 1308 1309 1310 1311 1312 1313
      end

      it 'returns a 400 error' do
        expect(response).to have_http_status(:bad_request)
      end

      it 'has a message with the name of the first missing section' do
1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353
        expect(json_response['message']).to include('6eb14e00385d2fb284765eb1cd8d420d33d63fc9_21_21')
      end

      it 'does not create a new commit' do
        expect(original_head_sha).to eq(merge_request_with_conflicts.source_branch_head.sha)
      end
    end

    context 'when files are missing' do
      before do
        resolved_files = [
          {
            'new_path' => 'files/ruby/regex.rb',
            'old_path' => 'files/ruby/regex.rb',
            'sections' => {
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_9_9' => 'head',
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_21_21' => 'origin',
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_49_49' => 'origin'
            }
          }
        ]

        resolve_conflicts(resolved_files)
      end

      it 'returns a 400 error' do
        expect(response).to have_http_status(:bad_request)
      end

      it 'has a message with the name of the missing file' do
        expect(json_response['message']).to include('files/ruby/popen.rb')
      end

      it 'does not create a new commit' do
        expect(original_head_sha).to eq(merge_request_with_conflicts.source_branch_head.sha)
      end
    end

    context 'when a file has identical content to the conflict' do
      before do
1354 1355 1356 1357
        content = MergeRequests::Conflicts::ListService.new(merge_request_with_conflicts).
                    file_for_path('files/ruby/popen.rb', 'files/ruby/popen.rb').
                    content

1358 1359 1360 1361
        resolved_files = [
          {
            'new_path' => 'files/ruby/popen.rb',
            'old_path' => 'files/ruby/popen.rb',
1362
            'content' => content
1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382
          }, {
            'new_path' => 'files/ruby/regex.rb',
            'old_path' => 'files/ruby/regex.rb',
            'sections' => {
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_9_9' => 'head',
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_21_21' => 'origin',
              '6eb14e00385d2fb284765eb1cd8d420d33d63fc9_49_49' => 'origin'
            }
          }
        ]

        resolve_conflicts(resolved_files)
      end

      it 'returns a 400 error' do
        expect(response).to have_http_status(:bad_request)
      end

      it 'has a message with the path of the problem file' do
        expect(json_response['message']).to include('files/ruby/popen.rb')
1383 1384 1385 1386 1387 1388
      end

      it 'does not create a new commit' do
        expect(original_head_sha).to eq(merge_request_with_conflicts.source_branch_head.sha)
      end
    end
1389
  end
1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402

  describe 'POST assign_related_issues' do
    let(:issue1) { create(:issue, project: project) }
    let(:issue2) { create(:issue, project: project) }

    def post_assign_issues
      merge_request.update!(description: "Closes #{issue1.to_reference} and #{issue2.to_reference}",
                            author: user,
                            source_branch: 'feature',
                            target_branch: 'master')

      post :assign_related_issues,
           namespace_id: project.namespace.to_param,
1403
           project_id: project,
1404 1405 1406 1407 1408 1409 1410 1411 1412 1413
           id: merge_request.iid
    end

    it 'shows a flash message on success' do
      post_assign_issues

      expect(flash[:notice]).to eq '2 issues have been assigned to you'
    end

    it 'correctly pluralizes flash message on success' do
1414
      issue2.assignees = [user]
1415 1416 1417 1418 1419

      post_assign_issues

      expect(flash[:notice]).to eq '1 issue has been assigned to you'
    end
1420 1421

    it 'calls MergeRequests::AssignIssuesService' do
1422 1423 1424
      expect(MergeRequests::AssignIssuesService).to receive(:new).
        with(project, user, merge_request: merge_request).
        and_return(double(execute: { count: 1 }))
1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436

      post_assign_issues
    end

    it 'is skipped when not signed in' do
      project.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
      sign_out(:user)

      expect(MergeRequests::AssignIssuesService).not_to receive(:new)

      post_assign_issues
    end
1437
  end
1438 1439

  describe 'GET ci_environments_status' do
1440
    context 'the environment is from a forked project' do
1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457
      let!(:forked)       { create(:project) }
      let!(:environment)  { create(:environment, project: forked) }
      let!(:deployment)   { create(:deployment, environment: environment, sha: forked.commit.id, ref: 'master') }
      let(:admin)         { create(:admin) }

      let(:merge_request) do
        create(:forked_project_link, forked_to_project: forked,
                                     forked_from_project: project)

        create(:merge_request, source_project: forked, target_project: project)
      end

      before do
        forked.team << [user, :master]

        get :ci_environments_status,
          namespace_id: merge_request.project.namespace.to_param,
1458
          project_id: merge_request.project,
1459 1460 1461 1462 1463 1464 1465 1466
          id: merge_request.iid, format: 'json'
      end

      it 'links to the environment on that project' do
        expect(json_response.first['url']).to match /#{forked.path_with_namespace}/
      end
    end
  end
1467

1468
  describe 'GET pipeline_status.json' do
1469 1470
    context 'when head_pipeline exists' do
      let!(:pipeline) do
Shinya Maeda's avatar
Shinya Maeda committed
1471
        create(:ci_pipeline, project: merge_request.source_project,
Shinya Maeda's avatar
Shinya Maeda committed
1472
                             ref: merge_request.source_branch,
1473 1474
                             sha: merge_request.diff_head_sha,
                             head_pipeline_of: merge_request)
Shinya Maeda's avatar
Shinya Maeda committed
1475 1476
      end

1477 1478
      let(:status) { pipeline.detailed_status(double('user')) }

Felipe Artur's avatar
Felipe Artur committed
1479 1480 1481
      before do
        get_pipeline_status
      end
1482 1483

      it 'return a detailed head_pipeline status in json' do
Shinya Maeda's avatar
Shinya Maeda committed
1484
        expect(response).to have_http_status(:ok)
Shinya Maeda's avatar
Shinya Maeda committed
1485 1486 1487
        expect(json_response['text']).to eq status.text
        expect(json_response['label']).to eq status.label
        expect(json_response['icon']).to eq status.icon
1488
        expect(json_response['favicon']).to eq "/assets/ci_favicons/#{status.favicon}.ico"
Shinya Maeda's avatar
Shinya Maeda committed
1489 1490
      end
    end
1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506

    context 'when head_pipeline does not exist' do
      before { get_pipeline_status }

      it 'return empty' do
        expect(response).to have_http_status(:ok)
        expect(json_response).to be_empty
      end
    end

    def get_pipeline_status
      get :pipeline_status, namespace_id: project.namespace,
                            project_id: project,
                            id: merge_request.iid,
                            format: :json
    end
Shinya Maeda's avatar
Shinya Maeda committed
1507
  end
1508
end