summaryrefslogtreecommitdiff
path: root/spec/models/blob_viewer
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-05-30 21:48:30 -0500
committerDouwe Maan <douwe@selenight.nl>2017-05-30 21:48:30 -0500
commitce869e3964a40b4cf04a803f5201d940ad61b13c (patch)
tree826985092006a35e03d923c9b002db936d8c9894 /spec/models/blob_viewer
parentd9461314ada3135593a53ba61a73dd695ee3a38d (diff)
downloadgitlab-ce-ce869e3964a40b4cf04a803f5201d940ad61b13c.tar.gz
Fix Diff#too_large? and specs
Diffstat (limited to 'spec/models/blob_viewer')
-rw-r--r--spec/models/blob_viewer/base_spec.rb36
1 files changed, 4 insertions, 32 deletions
diff --git a/spec/models/blob_viewer/base_spec.rb b/spec/models/blob_viewer/base_spec.rb
index 0749ff78777..d56379eb59d 100644
--- a/spec/models/blob_viewer/base_spec.rb
+++ b/spec/models/blob_viewer/base_spec.rb
@@ -105,36 +105,8 @@ describe BlobViewer::Base, model: true do
end
end
- describe '#can_expanded?' do
- context 'when the blob size is larger than the collapse limit' do
- context 'when the blob size is larger than the size limit' do
- let(:blob) { fake_blob(path: 'file.pdf', size: 10.megabytes) }
-
- it 'returns false' do
- expect(viewer.can_expanded?).to be_falsey
- end
- end
-
- context 'when the blob size is smaller than the size limit' do
- let(:blob) { fake_blob(path: 'file.pdf', size: 2.megabytes) }
-
- it 'returns true' do
- expect(viewer.can_expanded?).to be_truthy
- end
- end
- end
-
- context 'when the blob size is smaller than the collapse limit' do
- let(:blob) { fake_blob(path: 'file.pdf', size: 10.kilobytes) }
-
- it 'returns false' do
- expect(viewer.can_expanded?).to be_falsey
- end
- end
- end
-
describe '#render_error' do
- context 'when the size limit is overridden' do
+ context 'when expanded' do
before do
viewer.expanded = true
end
@@ -156,12 +128,12 @@ describe BlobViewer::Base, model: true do
end
end
- context 'when the size limit is not overridden' do
+ context 'when not expanded' do
context 'when the blob size is larger than the collapse limit' do
let(:blob) { fake_blob(path: 'file.pdf', size: 2.megabytes) }
- it 'returns :too_large' do
- expect(viewer.render_error).to eq(:too_large)
+ it 'returns :collapsed' do
+ expect(viewer.render_error).to eq(:collapsed)
end
end