diff options
author | Valery Sizov <valery@gitlab.com> | 2017-12-19 13:52:57 +0200 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-12-19 14:54:45 +0000 |
commit | 8b13bdbe4d5805727c2c165f8cf0c7593c4af92d (patch) | |
tree | 71c89b6add9bce092fe4ee0ef9dab6c881a5bb3a /spec | |
parent | 7ed3759ebb196dc7466b63cabbe12ed43ee7b286 (diff) | |
download | gitlab-ce-8b13bdbe4d5805727c2c165f8cf0c7593c4af92d.tar.gz |
[CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/git/gitlab_projects_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/lib/gitlab/git/gitlab_projects_spec.rb b/spec/lib/gitlab/git/gitlab_projects_spec.rb index 18906955df6..24da9589458 100644 --- a/spec/lib/gitlab/git/gitlab_projects_spec.rb +++ b/spec/lib/gitlab/git/gitlab_projects_spec.rb @@ -41,7 +41,8 @@ describe Gitlab::Git::GitlabProjects do end it "fails if the source path doesn't exist" do - expect(logger).to receive(:error).with("mv-project failed: source path <#{tmp_repos_path}/bad-src.git> does not exist.") + expected_source_path = File.join(tmp_repos_path, 'bad-src.git') + expect(logger).to receive(:error).with("mv-project failed: source path <#{expected_source_path}> does not exist.") result = build_gitlab_projects(tmp_repos_path, 'bad-src.git').mv_project('repo.git') expect(result).to be_falsy @@ -50,7 +51,8 @@ describe Gitlab::Git::GitlabProjects do it 'fails if the destination path already exists' do FileUtils.mkdir_p(File.join(tmp_repos_path, 'already-exists.git')) - message = "mv-project failed: destination path <#{tmp_repos_path}/already-exists.git> already exists." + expected_distination_path = File.join(tmp_repos_path, 'already-exists.git') + message = "mv-project failed: destination path <#{expected_distination_path}> already exists." expect(logger).to receive(:error).with(message) expect(gl_projects.mv_project('already-exists.git')).to be_falsy |