diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-05-11 13:55:43 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-05-11 13:55:43 +0000 |
commit | 27d0c4298649b4ecfcf593132492cf671365a424 (patch) | |
tree | 492a73c61b8d12be7bfb8bdcb1e8dc5b4a7f81db /spec | |
parent | 8c2b73dc8c5adf41b94033fe1d0a265524e304c4 (diff) | |
parent | cc7931cc9c38a54eb7d5b721113f8bf89781e447 (diff) | |
download | gitlab-ce-27d0c4298649b4ecfcf593132492cf671365a424.tar.gz |
Merge branch 'zj-remove-repo-path-strip-storage-path' into 'master'
Remove Gitlab::RepoPath.strip_storage_path
See merge request gitlab-org/gitlab-ce!18904
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/repo_path_spec.rb | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/spec/lib/gitlab/repo_path_spec.rb b/spec/lib/gitlab/repo_path_spec.rb index f030f371372..13940713dfc 100644 --- a/spec/lib/gitlab/repo_path_spec.rb +++ b/spec/lib/gitlab/repo_path_spec.rb @@ -45,25 +45,6 @@ describe ::Gitlab::RepoPath do end end - describe '.strip_storage_path' do - before do - allow(Gitlab.config.repositories).to receive(:storages).and_return({ - 'storage1' => Gitlab::GitalyClient::StorageSettings.new('path' => '/foo'), - 'storage2' => Gitlab::GitalyClient::StorageSettings.new('path' => '/bar') - }) - end - - it 'strips the storage path' do - expect(described_class.strip_storage_path('/bar/foo/qux/baz.git')).to eq('foo/qux/baz.git') - end - - it 'raises NotFoundError if no storage matches the path' do - expect { described_class.strip_storage_path('/doesnotexist/foo.git') }.to raise_error( - described_class::NotFoundError - ) - end - end - describe '.find_project' do let(:project) { create(:project) } let(:redirect) { project.route.create_redirect('foo/bar/baz') } |