Commit fcdc4279 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Add test that shows DiffCollection restart bug

parent 48422b41
...@@ -10,7 +10,7 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do ...@@ -10,7 +10,7 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do
no_collapse: no_collapse no_collapse: no_collapse
) )
end end
let(:iterator) { Array.new(file_count, fake_diff(line_length, line_count)) } let(:iterator) { MutatingConstantIterator.new(file_count, fake_diff(line_length, line_count)) }
let(:file_count) { 0 } let(:file_count) { 0 }
let(:line_length) { 1 } let(:line_length) { 1 }
let(:line_count) { 1 } let(:line_count) { 1 }
...@@ -64,8 +64,16 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do ...@@ -64,8 +64,16 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do
subject { super().real_size } subject { super().real_size }
it { is_expected.to eq('3') } it { is_expected.to eq('3') }
end end
describe '#size' do
it { expect(subject.size).to eq(3) } it { expect(subject.size).to eq(3) }
it 'does not change after peeking' do
subject.any?
expect(subject.size).to eq(3)
end
end
context 'when limiting is disabled' do context 'when limiting is disabled' do
let(:all_diffs) { true } let(:all_diffs) { true }
...@@ -83,7 +91,15 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do ...@@ -83,7 +91,15 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do
subject { super().real_size } subject { super().real_size }
it { is_expected.to eq('3') } it { is_expected.to eq('3') }
end end
describe '#size' do
it { expect(subject.size).to eq(3) } it { expect(subject.size).to eq(3) }
it 'does not change after peeking' do
subject.any?
expect(subject.size).to eq(3)
end
end
end end
end end
...@@ -457,4 +473,22 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do ...@@ -457,4 +473,22 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do
def fake_diff(line_length, line_count) def fake_diff(line_length, line_count)
{ 'diff' => "#{'a' * line_length}\n" * line_count } { 'diff' => "#{'a' * line_length}\n" * line_count }
end end
class MutatingConstantIterator
include Enumerable
def initialize(count, value)
@count = count
@value = value
end
def each
loop do
break if @count.zero?
# It is critical to decrement before yielding. We may never reach the lines after 'yield'.
@count -= 1
yield @value
end
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment