summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/models/blob.rb4
-rw-r--r--spec/controllers/concerns/renders_blob_spec.rb5
-rw-r--r--spec/models/blob_spec.rb192
-rw-r--r--spec/models/blob_viewer/base_spec.rb5
-rw-r--r--spec/views/projects/blob/_render_error.html.haml_spec.rb5
-rw-r--r--spec/views/projects/blob/_viewer.html.haml_spoc.rb5
-rw-r--r--spec/views/projects/blob/_viewer_switcher.html.haml_spoc.rb5
-rw-r--r--spec/views/projects/blob/_viewer_wrapper.html.haml_spoc.rb5
8 files changed, 33 insertions, 193 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb
index 26ee2c883a0..1bb9ed03c11 100644
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -28,13 +28,13 @@ class Blob < SimpleDelegator
#
# blob = Blob.decorate(nil)
# puts "truthy" if blob # No output
- def self.decorate(blob, project)
+ def self.decorate(blob, project = nil)
return if blob.nil?
new(blob, project)
end
- def initialize(blob, project)
+ def initialize(blob, project = nil)
@project = project
super(blob)
diff --git a/spec/controllers/concerns/renders_blob_spec.rb b/spec/controllers/concerns/renders_blob_spec.rb
new file mode 100644
index 00000000000..5f07afc5479
--- /dev/null
+++ b/spec/controllers/concerns/renders_blob_spec.rb
@@ -0,0 +1,5 @@
+include 'spec_helper'
+
+describe Projects::BlobController, RendersBlob, model: true do
+ # TODO: Test
+end
diff --git a/spec/models/blob_spec.rb b/spec/models/blob_spec.rb
index e5dd57fc4bb..fd42a87c37e 100644
--- a/spec/models/blob_spec.rb
+++ b/spec/models/blob_spec.rb
@@ -27,195 +27,5 @@ describe Blob do
end
end
- describe '#svg?' do
- it 'is falsey when not text' do
- git_blob = double(text?: false)
-
- expect(described_class.decorate(git_blob)).not_to be_svg
- end
-
- it 'is falsey when no language is detected' do
- git_blob = double(text?: true, language: nil)
-
- expect(described_class.decorate(git_blob)).not_to be_svg
- end
-
- it' is falsey when language is not SVG' do
- git_blob = double(text?: true, language: double(name: 'XML'))
-
- expect(described_class.decorate(git_blob)).not_to be_svg
- end
-
- it 'is truthy when language is SVG' do
- git_blob = double(text?: true, language: double(name: 'SVG'))
-
- expect(described_class.decorate(git_blob)).to be_svg
- end
- end
-
- describe '#pdf?' do
- it 'is falsey when file extension is not .pdf' do
- git_blob = Gitlab::Git::Blob.new(name: 'git_blob.txt')
-
- expect(described_class.decorate(git_blob)).not_to be_pdf
- end
-
- it 'is truthy when file extension is .pdf' do
- git_blob = Gitlab::Git::Blob.new(name: 'git_blob.pdf')
-
- expect(described_class.decorate(git_blob)).to be_pdf
- end
- end
-
- describe '#ipython_notebook?' do
- it 'is falsey when language is not Jupyter Notebook' do
- git_blob = double(text?: true, language: double(name: 'JSON'))
-
- expect(described_class.decorate(git_blob)).not_to be_ipython_notebook
- end
-
- it 'is truthy when language is Jupyter Notebook' do
- git_blob = double(text?: true, language: double(name: 'Jupyter Notebook'))
-
- expect(described_class.decorate(git_blob)).to be_ipython_notebook
- end
- end
-
- describe '#sketch?' do
- it 'is falsey with image extension' do
- git_blob = Gitlab::Git::Blob.new(name: "design.png")
-
- expect(described_class.decorate(git_blob)).not_to be_sketch
- end
-
- it 'is truthy with sketch extension' do
- git_blob = Gitlab::Git::Blob.new(name: "design.sketch")
-
- expect(described_class.decorate(git_blob)).to be_sketch
- end
- end
-
- describe '#video?' do
- it 'is falsey with image extension' do
- git_blob = Gitlab::Git::Blob.new(name: 'image.png')
-
- expect(described_class.decorate(git_blob)).not_to be_video
- end
-
- UploaderHelper::VIDEO_EXT.each do |ext|
- it "is truthy when extension is .#{ext}" do
- git_blob = Gitlab::Git::Blob.new(name: "video.#{ext}")
-
- expect(described_class.decorate(git_blob)).to be_video
- end
- end
- end
-
- describe '#stl?' do
- it 'is falsey with image extension' do
- git_blob = Gitlab::Git::Blob.new(name: 'file.png')
-
- expect(described_class.decorate(git_blob)).not_to be_stl
- end
-
- it 'is truthy with STL extension' do
- git_blob = Gitlab::Git::Blob.new(name: 'file.stl')
-
- expect(described_class.decorate(git_blob)).to be_stl
- end
- end
-
- describe '#to_partial_path' do
- let(:project) { double(lfs_enabled?: true) }
-
- def stubbed_blob(overrides = {})
- overrides.reverse_merge!(
- name: nil,
- image?: false,
- language: nil,
- lfs_pointer?: false,
- svg?: false,
- text?: false,
- binary?: false,
- stl?: false
- )
-
- described_class.decorate(Gitlab::Git::Blob.new({})).tap do |blob|
- allow(blob).to receive_messages(overrides)
- end
- end
-
- it 'handles LFS pointers with LFS enabled' do
- blob = stubbed_blob(lfs_pointer?: true, text?: true)
- expect(blob.to_partial_path(project)).to eq 'download'
- end
-
- it 'handles LFS pointers with LFS disabled' do
- blob = stubbed_blob(lfs_pointer?: true, text?: true)
- project = double(lfs_enabled?: false)
- expect(blob.to_partial_path(project)).to eq 'text'
- end
-
- it 'handles SVGs' do
- blob = stubbed_blob(text?: true, svg?: true)
- expect(blob.to_partial_path(project)).to eq 'svg'
- end
-
- it 'handles images' do
- blob = stubbed_blob(image?: true)
- expect(blob.to_partial_path(project)).to eq 'image'
- end
-
- it 'handles text' do
- blob = stubbed_blob(text?: true, name: 'test.txt')
- expect(blob.to_partial_path(project)).to eq 'text'
- end
-
- it 'defaults to download' do
- blob = stubbed_blob
- expect(blob.to_partial_path(project)).to eq 'download'
- end
-
- it 'handles PDFs' do
- blob = stubbed_blob(name: 'blob.pdf', pdf?: true)
- expect(blob.to_partial_path(project)).to eq 'pdf'
- end
-
- it 'handles iPython notebooks' do
- blob = stubbed_blob(text?: true, ipython_notebook?: true)
- expect(blob.to_partial_path(project)).to eq 'notebook'
- end
-
- it 'handles Sketch files' do
- blob = stubbed_blob(text?: true, sketch?: true, binary?: true)
- expect(blob.to_partial_path(project)).to eq 'sketch'
- end
-
- it 'handles STLs' do
- blob = stubbed_blob(text?: true, stl?: true)
- expect(blob.to_partial_path(project)).to eq 'stl'
- end
- end
-
- describe '#size_within_svg_limits?' do
- let(:blob) { described_class.decorate(double(:blob)) }
-
- it 'returns true when the blob size is smaller than the SVG limit' do
- expect(blob).to receive(:size).and_return(42)
-
- expect(blob.size_within_svg_limits?).to eq(true)
- end
-
- it 'returns true when the blob size is equal to the SVG limit' do
- expect(blob).to receive(:size).and_return(Blob::MAXIMUM_SVG_SIZE)
-
- expect(blob.size_within_svg_limits?).to eq(true)
- end
-
- it 'returns false when the blob size is larger than the SVG limit' do
- expect(blob).to receive(:size).and_return(1.terabyte)
-
- expect(blob.size_within_svg_limits?).to eq(false)
- end
- end
+ # TODO: Test new methods
end
diff --git a/spec/models/blob_viewer/base_spec.rb b/spec/models/blob_viewer/base_spec.rb
new file mode 100644
index 00000000000..e176d9c751b
--- /dev/null
+++ b/spec/models/blob_viewer/base_spec.rb
@@ -0,0 +1,5 @@
+include 'spec_helper'
+
+describe BlobViewer::Base, model: true do
+ # TODO: Test
+end
diff --git a/spec/views/projects/blob/_render_error.html.haml_spec.rb b/spec/views/projects/blob/_render_error.html.haml_spec.rb
new file mode 100644
index 00000000000..fabd444a6ad
--- /dev/null
+++ b/spec/views/projects/blob/_render_error.html.haml_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe 'app/views/projects/blob/_render_error.html.haml' do
+ # TODO: Test
+end
diff --git a/spec/views/projects/blob/_viewer.html.haml_spoc.rb b/spec/views/projects/blob/_viewer.html.haml_spoc.rb
new file mode 100644
index 00000000000..1d2055c10fc
--- /dev/null
+++ b/spec/views/projects/blob/_viewer.html.haml_spoc.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe 'app/views/projects/blob/_viewer.html.haml' do
+ # TODO: Test
+end
diff --git a/spec/views/projects/blob/_viewer_switcher.html.haml_spoc.rb b/spec/views/projects/blob/_viewer_switcher.html.haml_spoc.rb
new file mode 100644
index 00000000000..337f40d50df
--- /dev/null
+++ b/spec/views/projects/blob/_viewer_switcher.html.haml_spoc.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe 'app/views/projects/blob/_viewer_switcher.html.haml' do
+ # TODO: Test
+end
diff --git a/spec/views/projects/blob/_viewer_wrapper.html.haml_spoc.rb b/spec/views/projects/blob/_viewer_wrapper.html.haml_spoc.rb
new file mode 100644
index 00000000000..433ff1e63b9
--- /dev/null
+++ b/spec/views/projects/blob/_viewer_wrapper.html.haml_spoc.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe 'app/views/projects/blob/_viewer_wrapper.html.haml' do
+ # TODO: Test
+end
View Lorry Controller Status