summaryrefslogtreecommitdiff
path: root/spec/serializers/diffs_entity_spec.rb
blob: aef7d3732f86f61260120a2240a8647c2c02c321 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
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
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
# frozen_string_literal: true

require 'spec_helper'

RSpec.describe DiffsEntity do
  let_it_be(:user) { create(:user) }
  let_it_be(:project) { create(:project, :repository) }
  let_it_be(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }

  let(:request) { EntityRequest.new(project: project, current_user: user) }
  let(:merge_request_diffs) { merge_request.merge_request_diffs }
  let(:allow_tree_conflicts) { false }
  let(:options) do
    {
      request: request,
      merge_request: merge_request,
      merge_request_diffs: merge_request_diffs,
      allow_tree_conflicts: allow_tree_conflicts
    }
  end

  let(:entity) do
    described_class.new(merge_request_diffs.first.diffs, options)
  end

  context 'as json' do
    subject { entity.as_json }

    it 'contains needed attributes' do
      expect(subject).to include(
        :real_size, :size, :branch_name,
        :target_branch_name, :commit, :merge_request_diff,
        :start_version, :latest_diff, :latest_version_path,
        :added_lines, :removed_lines, :render_overflow_warning,
        :email_patch_path, :plain_diff_path, :diff_files,
        :merge_request_diffs, :definition_path_prefix
      )
    end

    context 'broken merge request' do
      let(:merge_request) { create(:merge_request, :invalid, target_project: project, source_project: project) }

      it 'renders without errors' do
        expect { subject }.not_to raise_error
      end
    end

    context "when a commit_id is passed" do
      let(:commits) { merge_request.commits }
      let(:entity) do
        described_class.new(
          merge_request_diffs.first.diffs,
          request: request,
          merge_request: merge_request,
          merge_request_diffs: merge_request_diffs,
          commit: commit
        )
      end

      subject { entity.as_json }

      context "when the passed commit is not the first or last in the group" do
        let(:commit) { commits.third }

        it 'includes commit references for previous and next' do
          expect(subject[:commit][:next_commit_id]).to eq(commits.second.id)
          expect(subject[:commit][:prev_commit_id]).to eq(commits.fourth.id)
        end
      end

      context "when the passed commit is the first in the group" do
        let(:commit) { commits.first }

        it 'includes commit references for nil and previous commit' do
          expect(subject[:commit][:next_commit_id]).to be_nil
          expect(subject[:commit][:prev_commit_id]).to eq(commits.second.id)
        end
      end

      context "when the passed commit is the last in the group" do
        let(:commit) { commits.last }

        it 'includes commit references for the next and nil' do
          expect(subject[:commit][:next_commit_id]).to eq(commits[-2].id)
          expect(subject[:commit][:prev_commit_id]).to be_nil
        end
      end
    end

    context 'when there are conflicts' do
      let(:diff_files) { merge_request_diffs.first.diffs.diff_files }
      let(:diff_file_with_conflict) { diff_files.to_a.last }
      let(:diff_file_without_conflict) { diff_files.to_a[-2] }

      let(:resolvable_conflicts) { true }
      let(:conflict_file) { double(path: diff_file_with_conflict.new_path, conflict_type: :both_modified) }
      let(:conflicts) { double(conflicts: double(files: [conflict_file]), can_be_resolved_in_ui?: resolvable_conflicts) }

      let(:merge_ref_head_diff) { true }
      let(:options) { super().merge(merge_ref_head_diff: merge_ref_head_diff) }

      before do
        allow(MergeRequests::Conflicts::ListService).to receive(:new).and_return(conflicts)
      end

      it 'conflicts are highlighted' do
        expect(conflict_file).to receive(:diff_lines_for_serializer)
        expect(diff_file_with_conflict).not_to receive(:diff_lines_for_serializer)
        expect(diff_file_without_conflict).to receive(:diff_lines_for_serializer).twice # for highlighted_diff_lines and is_fully_expanded

        subject
      end

      context 'merge ref head diff is not chosen to be displayed' do
        let(:merge_ref_head_diff) { false }

        it 'conflicts are not calculated' do
          expect(MergeRequests::Conflicts::ListService).not_to receive(:new)
        end
      end

      context 'when conflicts cannot be resolved' do
        let(:resolvable_conflicts) { false }

        it 'conflicts are not highlighted' do
          expect(conflict_file).not_to receive(:diff_lines_for_serializer)
          expect(diff_file_with_conflict).to receive(:diff_lines_for_serializer).twice  # for highlighted_diff_lines and is_fully_expanded
          expect(diff_file_without_conflict).to receive(:diff_lines_for_serializer).twice # for highlighted_diff_lines and is_fully_expanded

          subject
        end

        context 'when allow_tree_conflicts is set to true' do
          let(:allow_tree_conflicts) { true }

          it 'conflicts are still highlighted' do
            expect(conflict_file).to receive(:diff_lines_for_serializer)
            expect(diff_file_with_conflict).not_to receive(:diff_lines_for_serializer)
            expect(diff_file_without_conflict).to receive(:diff_lines_for_serializer).twice # for highlighted_diff_lines and is_fully_expanded

            subject
          end
        end
      end
    end
  end
end