From 0523cf8372d7b945f88afbd5ac7486b8b5a4fd24 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 9 May 2018 11:52:23 +0000 Subject: Merge branch 'cherry-pick-7b8d754e-ce' into 'master' Adjust spec to build correct path when storage path ends in slash See merge request gitlab-org/gitlab-ce!18843 --- spec/helpers/projects_helper_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb index 8fcb175416f..f8877b6d1aa 100644 --- a/spec/helpers/projects_helper_spec.rb +++ b/spec/helpers/projects_helper_spec.rb @@ -283,7 +283,7 @@ describe ProjectsHelper do end it 'removes the repo path' do - repo = "#{storage_path}/namespace/test.git" + repo = File.join(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') -- cgit v1.2.3