blob: ff9acfd08b9d5d881df9fb0187c42b5fd9508da2 (
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
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
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
192
193
194
195
196
197
198
199
200
201
202
203
204
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
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
|
require 'spec_helper'
describe Gitlab::Diff::File do
include RepoHelpers
let(:project) { create(:project, :repository) }
let(:commit) { project.commit(sample_commit.id) }
let(:diff) { commit.raw_diffs.first }
let(:diff_file) { described_class.new(diff, diff_refs: commit.diff_refs, repository: project.repository) }
describe '#diff_lines' do
let(:diff_lines) { diff_file.diff_lines }
it { expect(diff_lines.size).to eq(30) }
it { expect(diff_lines.first).to be_kind_of(Gitlab::Diff::Line) }
end
describe '#highlighted_diff_lines' do
it 'highlights the diff and memoises the result' do
expect(Gitlab::Diff::Highlight).to receive(:new)
.with(diff_file, repository: project.repository)
.once
.and_call_original
diff_file.highlighted_diff_lines
end
end
describe '#mode_changed?' do
it { expect(diff_file.mode_changed?).to be_falsey }
end
describe '#too_large?' do
it 'returns true for a file that is too large' do
expect(diff).to receive(:too_large?).and_return(true)
expect(diff_file.too_large?).to eq(true)
end
it 'returns false for a file that is small enough' do
expect(diff).to receive(:too_large?).and_return(false)
expect(diff_file.too_large?).to eq(false)
end
end
describe '#collapsed?' do
it 'returns true for a file that is quite big' do
expect(diff).to receive(:collapsed?).and_return(true)
expect(diff_file.collapsed?).to eq(true)
end
it 'returns false for a file that is small enough' do
expect(diff).to receive(:collapsed?).and_return(false)
expect(diff_file.collapsed?).to eq(false)
end
end
describe '#old_blob' do
it 'returns blob of commit of base commit' do
old_data = diff_file.old_blob.data
expect(old_data).to include('raise "System commands must be given as an array of strings"')
end
end
describe '#new_blob' do
it 'returns blob of new commit' do
data = diff_file.new_blob.data
expect(data).to include('raise RuntimeError, "System commands must be given as an array of strings"')
end
end
describe '#diffable?' do
let(:commit) { project.commit('1a0b36b3cdad1d2ee32457c102a8c0b7056fa863') }
let(:diffs) { commit.diffs }
before do
info_dir_path = File.join(project.repository.path_to_repo, 'info')
FileUtils.mkdir(info_dir_path) unless File.exist?(info_dir_path)
File.write(File.join(info_dir_path, 'attributes'), "*.md -diff\n")
end
it "returns true for files that do not have attributes" do
diff_file = diffs.diff_file_with_new_path('LICENSE')
expect(diff_file.diffable?).to be_truthy
end
it "returns false for files that have been marked as not being diffable in attributes" do
diff_file = diffs.diff_file_with_new_path('README.md')
expect(diff_file.diffable?).to be_falsey
end
end
describe '#content_changed?' do
context 'when created' do
let(:commit) { project.commit('33f3729a45c02fc67d00adb1b8bca394b0e761d9') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/images/6049019_460s.jpg') }
it 'returns false' do
expect(diff_file.content_changed?).to be_falsey
end
end
context 'when deleted' do
let(:commit) { project.commit('d59c60028b053793cecfb4022de34602e1a9218e') }
let(:diff_file) { commit.diffs.diff_file_with_old_path('files/js/commit.js.coffee') }
it 'returns false' do
expect(diff_file.content_changed?).to be_falsey
end
end
context 'when renamed' do
let(:commit) { project.commit('94bb47ca1297b7b3731ff2a36923640991e9236f') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('CHANGELOG.md') }
it 'returns false' do
expect(diff_file.content_changed?).to be_falsey
end
end
context 'when content changed' do
context 'when binary' do
let(:commit) { project.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/images/6049019_460s.jpg') }
context 'when the blobs are different' do
it 'returns true' do
expect(diff_file.content_changed?).to be_truthy
end
end
context 'when there are no diff refs' do
before do
allow(diff_file).to receive(:diff_refs).and_return(nil)
end
it 'returns false' do
expect(diff_file.content_changed?).to be_falsey
end
end
end
context 'when not binary' do
let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
context 'when the blobs are different' do
it 'returns true' do
expect(diff_file.content_changed?).to be_truthy
end
end
context 'when there are no diff refs' do
before do
allow(diff_file).to receive(:diff_refs).and_return(nil)
end
it 'returns true' do
expect(diff_file.content_changed?).to be_truthy
end
end
end
end
end
describe '#simple_viewer' do
context 'when the file is not diffable' do
before do
allow(diff_file).to receive(:diffable?).and_return(false)
end
it 'returns a Not Diffable viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::NotDiffable)
end
end
context 'when the content changed' do
context 'when the file represented by the diff file is binary' do
before do
allow(diff_file).to receive(:raw_binary?).and_return(true)
end
it 'returns a No Preview viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::NoPreview)
end
end
context 'when the diff file old and new blob types are different' do
before do
allow(diff_file).to receive(:different_type?).and_return(true)
end
it 'returns a No Preview viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::NoPreview)
end
end
context 'when the file represented by the diff file is text-based' do
it 'returns a text viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::Text)
end
end
end
context 'when created' do
let(:commit) { project.commit('913c66a37b4a45b9769037c55c2d238bd0942d2e') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
before do
allow(diff_file).to receive(:content_changed?).and_return(nil)
end
context 'when the file represented by the diff file is binary' do
before do
allow(diff_file).to receive(:raw_binary?).and_return(true)
end
it 'returns an Added viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::Added)
end
end
context 'when the diff file old and new blob types are different' do
before do
allow(diff_file).to receive(:different_type?).and_return(true)
end
it 'returns an Added viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::Added)
end
end
context 'when the file represented by the diff file is text-based' do
it 'returns a text viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::Text)
end
end
end
context 'when deleted' do
let(:commit) { project.commit('d59c60028b053793cecfb4022de34602e1a9218e') }
let(:diff_file) { commit.diffs.diff_file_with_old_path('files/js/commit.js.coffee') }
before do
allow(diff_file).to receive(:content_changed?).and_return(nil)
end
context 'when the file represented by the diff file is binary' do
before do
allow(diff_file).to receive(:raw_binary?).and_return(true)
end
it 'returns a Deleted viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::Deleted)
end
end
context 'when the diff file old and new blob types are different' do
before do
allow(diff_file).to receive(:different_type?).and_return(true)
end
it 'returns a Deleted viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::Deleted)
end
end
context 'when the file represented by the diff file is text-based' do
it 'returns a text viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::Text)
end
end
end
context 'when renamed' do
let(:commit) { project.commit('6907208d755b60ebeacb2e9dfea74c92c3449a1f') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/js/commit.coffee') }
before do
allow(diff_file).to receive(:content_changed?).and_return(nil)
end
it 'returns a Renamed viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::Renamed)
end
end
context 'when mode changed' do
before do
allow(diff_file).to receive(:content_changed?).and_return(nil)
allow(diff_file).to receive(:mode_changed?).and_return(true)
end
it 'returns a Mode Changed viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::ModeChanged)
end
end
context 'when no other conditions apply' do
before do
allow(diff_file).to receive(:content_changed?).and_return(false)
allow(diff_file).to receive(:new_file?).and_return(false)
allow(diff_file).to receive(:deleted_file?).and_return(false)
allow(diff_file).to receive(:renamed_file?).and_return(false)
allow(diff_file).to receive(:mode_changed?).and_return(false)
allow(diff_file).to receive(:raw_text?).and_return(false)
end
it 'returns a No Preview viewer' do
expect(diff_file.simple_viewer).to be_a(DiffViewer::NoPreview)
end
end
end
describe '#rich_viewer' do
let(:commit) { project.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/images/6049019_460s.jpg') }
context 'when the diff file has a matching viewer' do
context 'when the diff file content did not change' do
before do
allow(diff_file).to receive(:content_changed?).and_return(false)
end
it 'returns nil' do
expect(diff_file.rich_viewer).to be_nil
end
end
context 'when the diff file is not diffable' do
before do
allow(diff_file).to receive(:diffable?).and_return(false)
end
it 'returns nil' do
expect(diff_file.rich_viewer).to be_nil
end
end
context 'when the diff file old and new blob types are different' do
before do
allow(diff_file).to receive(:different_type?).and_return(true)
end
it 'returns nil' do
expect(diff_file.rich_viewer).to be_nil
end
end
context 'when the diff file has an external storage error' do
before do
allow(diff_file).to receive(:external_storage_error?).and_return(true)
end
it 'returns nil' do
expect(diff_file.rich_viewer).to be_nil
end
end
context 'when everything is right' do
it 'returns the viewer' do
expect(diff_file.rich_viewer).to be_a(DiffViewer::Image)
end
end
end
context 'when the diff file does not have a matching viewer' do
let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
it 'returns nil' do
expect(diff_file.rich_viewer).to be_nil
end
end
end
describe '#rendered_as_text?' do
context 'when the simple viewer is text-based' do
let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
context 'when ignoring errors' do
context 'when the viewer has render errors' do
before do
diff_file.diff.too_large!
end
it 'returns true' do
expect(diff_file.rendered_as_text?).to be_truthy
end
end
context "when the viewer doesn't have render errors" do
it 'returns true' do
expect(diff_file.rendered_as_text?).to be_truthy
end
end
end
context 'when not ignoring errors' do
context 'when the viewer has render errors' do
before do
diff_file.diff.too_large!
end
it 'returns false' do
expect(diff_file.rendered_as_text?(ignore_errors: false)).to be_falsey
end
end
context "when the viewer doesn't have render errors" do
it 'returns true' do
expect(diff_file.rendered_as_text?(ignore_errors: false)).to be_truthy
end
end
end
end
context 'when the simple viewer is binary' do
let(:commit) { project.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
let(:diff_file) { commit.diffs.diff_file_with_new_path('files/images/6049019_460s.jpg') }
it 'returns false' do
expect(diff_file.rendered_as_text?).to be_falsey
end
end
end
end
|