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
148
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe 'Merge Requests Diffs stream', feature_category: :code_review_workflow do
let_it_be(:project) { create(:project, :repository) }
let_it_be(:user) { create(:user, maintainer_of: project) }
let_it_be(:diff_options_hash) do
{
ignore_whitespace_change: false,
expanded: false,
use_extra_viewer_as_main: true,
offset_index: 0
}
end
before do
sign_in(user)
end
describe 'GET diffs_stream' do
def go(**extra_params)
params = {
namespace_id: project.namespace.to_param,
project_id: project,
id: merge_request.iid
}
get diffs_stream_namespace_project_merge_request_path(params.merge(extra_params))
end
let_it_be_with_reload(:merge_request) do
create(
:merge_request_with_diffs,
source_branch: 'expand-collapse-files',
target_branch: 'master',
target_project: project,
source_project: project
)
end
context 'when accessed' do
it 'passes hash of options to #diffs_for_streaming' do
expect_next_instance_of(::Projects::MergeRequests::DiffsStreamController) do |controller|
expect(controller).to receive(:stream_diff_files)
.with(diff_options_hash)
.and_call_original
end
go
end
end
context 'when offset is not given' do
it 'streams all diffs' do
go
expect(response).to have_gitlab_http_status(:success)
expect(response.body).to include(*file_identifier_hashes(merge_request.merge_request_diff))
end
context 'when HEAD diff is present' do
before do
merge_request.reset.create_merge_head_diff!
end
it 'streams all diffs' do
go
expect(response).to have_gitlab_http_status(:success)
expect(response.body).to include(*file_identifier_hashes(merge_request.merge_head_diff))
end
end
end
context 'when offset is given' do
let(:offset) { 5 }
it 'streams diffs except the offset' do
go(offset: offset)
diff_files = merge_request.merge_request_diff.diffs.diff_files.to_a
offset_file_identifier_hashes = diff_files.take(offset).map(&:file_identifier_hash)
remaining_file_identifier_hashes = diff_files.slice(offset..).map(&:file_identifier_hash)
expect(response).to have_gitlab_http_status(:success)
expect(response.body).not_to include(*offset_file_identifier_hashes)
expect(response.body).to include(*remaining_file_identifier_hashes)
end
end
context 'when an exception occurs' do
before do
allow(::RapidDiffs::DiffFileComponent)
.to receive(:new).and_raise(StandardError.new('something went wrong'))
end
it 'prints out error message' do
go
expect(response.body).to include('something went wrong')
end
end
context 'when rapid_diffs FF is disabled' do
before do
stub_feature_flags(rapid_diffs: false)
end
it 'returns 404' do
go
expect(response).to have_gitlab_http_status(:not_found)
end
end
context 'with diffs_blob option' do
context 'when offset is not given' do
it 'streams all diffs' do
go(diff_blobs: true)
expect(response).to have_gitlab_http_status(:success)
expect(response.body).to include(*file_identifier_hashes(merge_request.merge_request_diff))
end
end
context 'when offset is given' do
let(:offset) { 5 }
it 'streams diffs except the offset' do
go(diff_blobs: true, offset: offset)
diff_files = merge_request.merge_request_diff.diffs.diff_files.to_a
offset_file_identifier_hashes = diff_files.take(offset).map(&:file_identifier_hash)
remaining_file_identifier_hashes = diff_files.slice(offset..).map(&:file_identifier_hash)
expect(response).to have_gitlab_http_status(:success)
expect(response.body).not_to include(*offset_file_identifier_hashes)
expect(response.body).to include(*remaining_file_identifier_hashes)
end
end
end
end
def file_identifier_hashes(diff)
diff.diffs.diff_files.to_a.map(&:file_identifier_hash)
end
end
|
