summaryrefslogtreecommitdiff
path: root/spec/helpers
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-04-26 15:19:44 +0100
committerNick Thomas <nick@gitlab.com>2018-04-26 15:19:44 +0100
commit4de3bc5f93e016f1d84f43c0e27d8d2c6d82ddb0 (patch)
tree494aa5a6e72241bb76bea440d296bd30944a6c5e /spec/helpers
parentc2834665038c0932e041268a845b86f7c4e55162 (diff)
parent25c17102df4b583f322aaa577330e2bda1695d0e (diff)
downloadgitlab-ce-4de3bc5f93e016f1d84f43c0e27d8d2c6d82ddb0.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/projects_helper_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 46c55da24f8..8fcb175416f 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -274,16 +274,16 @@ describe ProjectsHelper do
end
end
- describe '#sanitized_import_error' do
+ describe '#sanitizerepo_repo_path' do
let(:project) { create(:project, :repository) }
+ let(:storage_path) { Gitlab.config.repositories.storages.default.legacy_disk_path }
before do
- allow(project).to receive(:repository_storage_path).and_return('/base/repo/path')
allow(Settings.shared).to receive(:[]).with('path').and_return('/base/repo/export/path')
end
it 'removes the repo path' do
- repo = '/base/repo/path/namespace/test.git'
+ repo = "#{storage_path}/namespace/test.git"
import_error = "Could not clone #{repo}\n"
expect(sanitize_repo_path(project, import_error)).to eq('Could not clone [REPOS PATH]/namespace/test.git')