diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-09 11:52:23 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-09 13:04:06 +0100 |
| commit | 0523cf8372d7b945f88afbd5ac7486b8b5a4fd24 (patch) | |
| tree | ec9cf081166e8eae2a9bc5634453c14be3e366d8 | |
| parent | 287d5da982e3b422899b51eac4db31976fbcfc63 (diff) | |
| download | gitlab-ce-0523cf8372d7b945f88afbd5ac7486b8b5a4fd24.tar.gz | |
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
| -rw-r--r-- | spec/helpers/projects_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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') |