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

Merge branch 'cherry-pick-7b8d754e-ce' into 'master'
0523cf83 · Grzegorz Bizon · Filipa Lacerda · 287d5da9 · 0523cf83
Commit 0523cf83 authored May 09, 2018 by Grzegorz Bizon Committed by Filipa Lacerda May 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

projects_helper_spec.rb spec/helpers/projects_helper_spec.rb +1 -1

No files found.
--- 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')