summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-01 12:53:57 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-01 12:53:57 +0000
commit7a2509ea1ff9e740d0842827cb9713187172adde (patch)
tree3092c01b004cee92807883b9a0a8fc18b1d08257
parent90cb2aab38341d308a65f79a4c11167c756ffc02 (diff)
parentf3569a25e493bf6b3eb9bb4f6227cc087fd179a6 (diff)
downloadgitlab-ce-7a2509ea1ff9e740d0842827cb9713187172adde.tar.gz
Merge branch 'blob-limit-test' into 'master'
Fix bug in blob test See merge request !13224
-rw-r--r--spec/lib/gitlab/git/blob_spec.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb
index 3c784eda4f8..18320bb23b9 100644
--- a/spec/lib/gitlab/git/blob_spec.rb
+++ b/spec/lib/gitlab/git/blob_spec.rb
@@ -78,12 +78,18 @@ describe Gitlab::Git::Blob, seed_helper: true do
context 'large file' do
let(:blob) { Gitlab::Git::Blob.find(repository, SeedRepo::Commit::ID, 'files/images/6049019_460s.jpg') }
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.data.length).to eq(blob_size) }
+ it { expect(blob.data.length).to eq(stub_limit) }
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
it 'can load all data' do