summaryrefslogtreecommitdiff
path: root/spec/models/blob_viewer
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-06-07 16:07:57 -0500
committerDouwe Maan <douwe@selenight.nl>2017-06-08 12:49:03 -0500
commit370bc86fb007c1683495bdf4082bf5442b517895 (patch)
tree3b435d88b5d18b96ca0ffb26f8a1618fba342bcc /spec/models/blob_viewer
parent7bd5b8c1c709163547ec865484b341211158ebf1 (diff)
downloadgitlab-ce-370bc86fb007c1683495bdf4082bf5442b517895.tar.gz
Detect if file that appears to be text in the first 1024 bytes is actually binary afer loading all datadm-blob-binaryness-change
Diffstat (limited to 'spec/models/blob_viewer')
-rw-r--r--spec/models/blob_viewer/base_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/blob_viewer/base_spec.rb b/spec/models/blob_viewer/base_spec.rb
index d56379eb59d..574438838d8 100644
--- a/spec/models/blob_viewer/base_spec.rb
+++ b/spec/models/blob_viewer/base_spec.rb
@@ -106,9 +106,9 @@ describe BlobViewer::Base, model: true do
end
describe '#render_error' do
- context 'when expanded' do
+ context 'when the blob is expanded' do
before do
- viewer.expanded = true
+ blob.expand!
end
context 'when the blob size is larger than the size limit' do