merge_requests.rb 4.8 KB
Newer Older
1 2 3 4 5 6 7
require 'spec_helper'

describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :controller do
  include JavaScriptFixturesHelpers

  let(:admin) { create(:admin) }
  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
8
  let(:project) { create(:project, :repository, namespace: namespace, path: 'merge-requests-project') }
9
  let(:merge_request) { create(:merge_request, :with_diffs, source_project: project, target_project: project, description: '- [ ] Task List Item') }
10
  let(:merged_merge_request) { create(:merge_request, :merged, source_project: project, target_project: project) }
11 12 13 14 15 16 17 18
  let(:pipeline) do
    create(
      :ci_pipeline,
      project: merge_request.source_project,
      ref: merge_request.source_branch,
      sha: merge_request.diff_head_sha
    )
  end
19 20 21 22 23 24 25 26 27 28
  let(:path) { "files/ruby/popen.rb" }
  let(:position) do
    Gitlab::Diff::Position.new(
      old_path: path,
      new_path: path,
      old_line: nil,
      new_line: 14,
      diff_refs: merge_request.diff_refs
    )
  end
29 30 31 32 33 34 35

  render_views

  before(:all) do
    clean_frontend_fixtures('merge_requests/')
  end

36
  before do
37
    sign_in(admin)
38
    allow(Discussion).to receive(:build_discussion_id).and_return(['discussionid:ceterumcenseo'])
39 40
  end

41 42 43 44
  after do
    remove_repository(project)
  end

45 46 47 48 49 50
  it 'merge_requests/merge_request_of_current_user.html.raw' do |example|
    merge_request.update(author: admin)

    render_merge_request(example.description, merge_request)
  end

51
  it 'merge_requests/merge_request_with_task_list.html.raw' do |example|
52 53
    create(:ci_build, :pending, pipeline: pipeline)

54 55 56
    render_merge_request(example.description, merge_request)
  end

57
  it 'merge_requests/merged_merge_request.html.raw' do |example|
58 59 60 61
    expect_next_instance_of(MergeRequest) do |merge_request|
      allow(merge_request).to receive(:source_branch_exists?).and_return(true)
      allow(merge_request).to receive(:can_remove_source_branch?).and_return(true)
    end
62 63 64
    render_merge_request(example.description, merged_merge_request)
  end

65 66 67 68 69 70
  it 'merge_requests/diff_comment.html.raw' do |example|
    create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
    create(:note_on_merge_request, author: admin, project: project, noteable: merge_request)
    render_merge_request(example.description, merge_request)
  end

F
Filipa Lacerda 已提交
71 72 73 74 75
  it 'merge_requests/merge_request_with_comment.html.raw' do |example|
    create(:note_on_merge_request, author: admin, project: project, noteable: merge_request, note: '- [ ] Task List Item')
    render_merge_request(example.description, merge_request)
  end

76 77 78 79 80 81 82 83 84 85
  it 'merge_requests/discussions.json' do |example|
    create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
    render_discussions_json(merge_request, example.description)
  end

  it 'merge_requests/diff_discussion.json' do |example|
    create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
    render_discussions_json(merge_request, example.description)
  end

86 87 88 89 90 91 92
  it 'merge_requests/resolved_diff_discussion.json' do |example|
    note = create(:discussion_note_on_merge_request, :resolved, project: project, author: admin, position: position, noteable: merge_request)
    create(:system_note, project: project, author: admin, noteable: merge_request, discussion_id: note.discussion.id)

    render_discussions_json(merge_request, example.description)
  end

93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114
  context 'with image diff' do
    let(:merge_request2) { create(:merge_request_with_diffs, :with_image_diffs, source_project: project, title: "Added images") }
    let(:image_path) { "files/images/ee_repo_logo.png" }
    let(:image_position) do
      Gitlab::Diff::Position.new(
        old_path: image_path,
        new_path: image_path,
        width: 100,
        height: 100,
        x: 1,
        y: 1,
        position_type: "image",
        diff_refs: merge_request2.diff_refs
      )
    end

    it 'merge_requests/image_diff_discussion.json' do |example|
      create(:diff_note_on_merge_request, project: project, noteable: merge_request2, position: image_position)
      render_discussions_json(merge_request2, example.description)
    end
  end

115 116
  private

117
  def render_discussions_json(merge_request, fixture_file_name)
118
    get :discussions, params: {
119 120
      namespace_id: project.namespace.to_param,
      project_id: project,
121 122
      id: merge_request.to_param
    }, format: :json
123 124 125 126

    store_frontend_fixture(response, fixture_file_name)
  end

D
Douwe Maan 已提交
127
  def render_merge_request(fixture_file_name, merge_request)
128
    get :show, params: {
129
      namespace_id: project.namespace.to_param,
130
      project_id: project,
131 132
      id: merge_request.to_param
    }, format: :html
133 134 135 136 137

    expect(response).to be_success
    store_frontend_fixture(response, fixture_file_name)
  end
end