Commit 7a2509ea authored by Sean McGivern's avatar Sean McGivern

Merge branch 'blob-limit-test' into 'master'

Fix bug in blob test

See merge request !13224
parents 90cb2aab f3569a25
...@@ -78,12 +78,18 @@ describe Gitlab::Git::Blob, seed_helper: true do ...@@ -78,12 +78,18 @@ describe Gitlab::Git::Blob, seed_helper: true do
context 'large file' do context 'large file' do
let(:blob) { Gitlab::Git::Blob.find(repository, SeedRepo::Commit::ID, 'files/images/6049019_460s.jpg') } let(:blob) { Gitlab::Git::Blob.find(repository, SeedRepo::Commit::ID, 'files/images/6049019_460s.jpg') }
let(:blob_size) { 111803 } let(:blob_size) { 111803 }
let(:stub_limit) { 1000 }
before do
stub_const('Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE', stub_limit)
end
it { expect(blob.size).to eq(blob_size) } it { expect(blob.size).to eq(blob_size) }
it { expect(blob.data.length).to eq(blob_size) } it { expect(blob.data.length).to eq(stub_limit) }
it 'check that this test is sane' do it 'check that this test is sane' do
expect(blob.size).to be <= Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE # It only makes sense to test limiting if the blob is larger than the limit.
expect(blob.size).to be > Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE
end end
it 'can load all data' do it 'can load all data' do
......
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