From b8ab35d6fedea6e93c755d5a805f13de8b8793a7 Mon Sep 17 00:00:00 2001 From: Ahmad Hassan Date: Wed, 31 Oct 2018 14:24:31 +0200 Subject: Add gitaly client specs --- spec/lib/gitlab/gitaly_client_spec.rb | 15 ++ spec/models/blob_spec.rb | 382 ---------------------------------- 2 files changed, 15 insertions(+), 382 deletions(-) delete mode 100644 spec/models/blob_spec.rb diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb index 81bcd8c28ed..65177c627f3 100644 --- a/spec/lib/gitlab/gitaly_client_spec.rb +++ b/spec/lib/gitlab/gitaly_client_spec.rb @@ -47,6 +47,21 @@ describe Gitlab::GitalyClient, skip_gitaly_mock: true do end end + context 'when passed a TLS address' do + it 'strips tls:// prefix before passing it to GRPC::Core::Channel initializer' do + address = 'localhost:9876' + prefixed_address = "tls://#{address}" + + allow(Gitlab.config.repositories).to receive(:storages).and_return({ + 'default' => { 'gitaly_address' => prefixed_address } + }) + + expect(Gitaly::CommitService::Stub).to receive(:new).with(address, any_args) + + described_class.stub(:commit_service, 'default') + end + end + context 'when passed a TCP address' do it 'strips tcp:// prefix before passing it to GRPC::Core::Channel initializer' do address = 'localhost:9876' diff --git a/spec/models/blob_spec.rb b/spec/models/blob_spec.rb deleted file mode 100644 index 81e35e6c931..00000000000 --- a/spec/models/blob_spec.rb +++ /dev/null @@ -1,382 +0,0 @@ -# encoding: utf-8 -require 'rails_helper' - -describe Blob do - include FakeBlobHelpers - - let(:project) { build(:project, lfs_enabled: true) } - - before do - allow(Gitlab.config.lfs).to receive(:enabled).and_return(true) - end - - describe '.decorate' do - it 'returns NilClass when given nil' do - expect(described_class.decorate(nil)).to be_nil - end - end - - describe '.lazy' do - let(:project) { create(:project, :repository) } - let(:commit) { project.commit_by(oid: 'e63f41fe459e62e1228fcef60d7189127aeba95a') } - - it 'fetches all blobs when the first is accessed' do - changelog = described_class.lazy(project, commit.id, 'CHANGELOG') - contributing = described_class.lazy(project, commit.id, 'CONTRIBUTING.md') - - expect(Gitlab::Git::Blob).to receive(:batch).once.and_call_original - expect(Gitlab::Git::Blob).not_to receive(:find) - - # Access property so the values are loaded - changelog.id - contributing.id - end - end - - describe '#data' do - context 'using a binary blob' do - it 'returns the data as-is' do - data = "\n\xFF\xB9\xC3" - blob = fake_blob(binary: true, data: data) - - expect(blob.data).to eq(data) - end - end - - context 'using a text blob' do - it 'converts the data to UTF-8' do - blob = fake_blob(binary: false, data: "\n\xFF\xB9\xC3") - - expect(blob.data).to eq("\n���") - end - end - end - - describe '#external_storage_error?' do - context 'if the blob is stored in LFS' do - let(:blob) { fake_blob(path: 'file.pdf', lfs: true) } - - context 'when the project has LFS enabled' do - it 'returns false' do - expect(blob.external_storage_error?).to be_falsey - end - end - - context 'when the project does not have LFS enabled' do - before do - project.lfs_enabled = false - end - - it 'returns true' do - expect(blob.external_storage_error?).to be_truthy - end - end - end - - context 'if the blob is not stored in LFS' do - let(:blob) { fake_blob(path: 'file.md') } - - it 'returns false' do - expect(blob.external_storage_error?).to be_falsey - end - end - end - - describe '#stored_externally?' do - context 'if the blob is stored in LFS' do - let(:blob) { fake_blob(path: 'file.pdf', lfs: true) } - - context 'when the project has LFS enabled' do - it 'returns true' do - expect(blob.stored_externally?).to be_truthy - end - end - - context 'when the project does not have LFS enabled' do - before do - project.lfs_enabled = false - end - - it 'returns false' do - expect(blob.stored_externally?).to be_falsey - end - end - end - - context 'if the blob is not stored in LFS' do - let(:blob) { fake_blob(path: 'file.md') } - - it 'returns false' do - expect(blob.stored_externally?).to be_falsey - end - end - end - - describe '#raw_binary?' do - context 'if the blob is stored externally' do - context 'if the extension has a rich viewer' do - context 'if the viewer is binary' do - it 'returns true' do - blob = fake_blob(path: 'file.pdf', lfs: true) - - expect(blob.raw_binary?).to be_truthy - end - end - - context 'if the viewer is text-based' do - it 'return false' do - blob = fake_blob(path: 'file.md', lfs: true) - - expect(blob.raw_binary?).to be_falsey - end - end - end - - context "if the extension doesn't have a rich viewer" do - context 'if the extension has a text mime type' do - context 'if the extension is for a programming language' do - it 'returns false' do - blob = fake_blob(path: 'file.txt', lfs: true) - - expect(blob.raw_binary?).to be_falsey - end - end - - context 'if the extension is not for a programming language' do - it 'returns false' do - blob = fake_blob(path: 'file.ics', lfs: true) - - expect(blob.raw_binary?).to be_falsey - end - end - end - - context 'if the extension has a binary mime type' do - context 'if the extension is for a programming language' do - it 'returns false' do - blob = fake_blob(path: 'file.rb', lfs: true) - - expect(blob.raw_binary?).to be_falsey - end - end - - context 'if the extension is not for a programming language' do - it 'returns true' do - blob = fake_blob(path: 'file.exe', lfs: true) - - expect(blob.raw_binary?).to be_truthy - end - end - end - - context 'if the extension has an unknown mime type' do - context 'if the extension is for a programming language' do - it 'returns false' do - blob = fake_blob(path: 'file.ini', lfs: true) - - expect(blob.raw_binary?).to be_falsey - end - end - - context 'if the extension is not for a programming language' do - it 'returns true' do - blob = fake_blob(path: 'file.wtf', lfs: true) - - expect(blob.raw_binary?).to be_truthy - end - end - end - end - end - - context 'if the blob is not stored externally' do - context 'if the blob is binary' do - it 'returns true' do - blob = fake_blob(path: 'file.pdf', binary: true) - - expect(blob.raw_binary?).to be_truthy - end - end - - context 'if the blob is text-based' do - it 'return false' do - blob = fake_blob(path: 'file.md') - - expect(blob.raw_binary?).to be_falsey - end - end - end - end - - describe '#extension' do - it 'returns the extension' do - blob = fake_blob(path: 'file.md') - - expect(blob.extension).to eq('md') - end - end - - describe '#file_type' do - it 'returns the file type' do - blob = fake_blob(path: 'README.md') - - expect(blob.file_type).to eq(:readme) - end - end - - describe '#simple_viewer' do - context 'when the blob is empty' do - it 'returns an empty viewer' do - blob = fake_blob(data: '', size: 0) - - expect(blob.simple_viewer).to be_a(BlobViewer::Empty) - end - end - - context 'when the file represented by the blob is binary' do - it 'returns a download viewer' do - blob = fake_blob(binary: true) - - expect(blob.simple_viewer).to be_a(BlobViewer::Download) - end - end - - context 'when the file represented by the blob is text-based' do - it 'returns a text viewer' do - blob = fake_blob - - expect(blob.simple_viewer).to be_a(BlobViewer::Text) - end - end - end - - describe '#rich_viewer' do - context 'when the blob has an external storage error' do - before do - project.lfs_enabled = false - end - - it 'returns nil' do - blob = fake_blob(path: 'file.pdf', lfs: true) - - expect(blob.rich_viewer).to be_nil - end - end - - context 'when the blob is empty' do - it 'returns nil' do - blob = fake_blob(data: '') - - expect(blob.rich_viewer).to be_nil - end - end - - context 'when the blob is stored externally' do - it 'returns a matching viewer' do - blob = fake_blob(path: 'file.pdf', lfs: true) - - expect(blob.rich_viewer).to be_a(BlobViewer::PDF) - end - end - - context 'when the blob is binary' do - it 'returns a matching binary viewer' do - blob = fake_blob(path: 'file.pdf', binary: true) - - expect(blob.rich_viewer).to be_a(BlobViewer::PDF) - end - end - - context 'when the blob is text-based' do - it 'returns a matching text-based viewer' do - blob = fake_blob(path: 'file.md') - - expect(blob.rich_viewer).to be_a(BlobViewer::Markup) - end - end - end - - describe '#auxiliary_viewer' do - context 'when the blob has an external storage error' do - before do - project.lfs_enabled = false - end - - it 'returns nil' do - blob = fake_blob(path: 'LICENSE', lfs: true) - - expect(blob.auxiliary_viewer).to be_nil - end - end - - context 'when the blob is empty' do - it 'returns nil' do - blob = fake_blob(data: '') - - expect(blob.auxiliary_viewer).to be_nil - end - end - - context 'when the blob is stored externally' do - it 'returns a matching viewer' do - blob = fake_blob(path: 'LICENSE', lfs: true) - - expect(blob.auxiliary_viewer).to be_a(BlobViewer::License) - end - end - - context 'when the blob is binary' do - it 'returns nil' do - blob = fake_blob(path: 'LICENSE', binary: true) - - expect(blob.auxiliary_viewer).to be_nil - end - end - - context 'when the blob is text-based' do - it 'returns a matching text-based viewer' do - blob = fake_blob(path: 'LICENSE') - - expect(blob.auxiliary_viewer).to be_a(BlobViewer::License) - end - end - end - - describe '#rendered_as_text?' do - context 'when ignoring errors' do - context 'when the simple viewer is text-based' do - it 'returns true' do - blob = fake_blob(path: 'file.md', size: 100.megabytes) - - expect(blob.rendered_as_text?).to be_truthy - end - end - - context 'when the simple viewer is binary' do - it 'returns false' do - blob = fake_blob(path: 'file.pdf', binary: true, size: 100.megabytes) - - expect(blob.rendered_as_text?).to be_falsey - end - end - end - - context 'when not ignoring errors' do - context 'when the viewer has render errors' do - it 'returns false' do - blob = fake_blob(path: 'file.md', size: 100.megabytes) - - expect(blob.rendered_as_text?(ignore_errors: false)).to be_falsey - end - end - - context "when the viewer doesn't have render errors" do - it 'returns true' do - blob = fake_blob(path: 'file.md') - - expect(blob.rendered_as_text?(ignore_errors: false)).to be_truthy - end - end - end - end -end -- cgit v1.2.1