diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-09 10:10:44 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-09 10:10:44 +0000 |
| commit | 66aad16d1aaa426237e52ef19385385566f194dc (patch) | |
| tree | 47784b6a677d4f8d1fd82bc435e0ea6c9380d775 /spec/models | |
| parent | 288e8c7c42bd9507725637dcf7e5b8e0eaa5229c (diff) | |
| parent | 370bc86fb007c1683495bdf4082bf5442b517895 (diff) | |
| download | gitlab-ce-66aad16d1aaa426237e52ef19385385566f194dc.tar.gz | |
Merge branch 'dm-blob-binaryness-change' into 'master'
Detect if blob binaryness changes after loading all data
See merge request !11981
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/blob_viewer/base_spec.rb | 4 |
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 |