diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-08-29 17:27:05 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-08-29 17:27:05 +0300 |
commit | b51770c66acf4ed7f1aa1df0019abcdb0e4cc130 (patch) | |
tree | 7558d9ca4740891f73304db199a52f3b2fa1bfc8 /spec/helpers | |
parent | 4e2af302f69367b54375aa696d40db0cdb79ed5f (diff) | |
parent | 6391eeec3078f97fac6f6ef92ca0d8c8f0068667 (diff) |
Merge branch 'local-test-failures' into 'master'
git-user-related local test failures
See merge request gitlab-org/gitlab-ce!31437
Diffstat (limited to 'spec/helpers')
-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 a70bfc2adc7..29c43d1977e 100644 --- a/spec/helpers/projects_helper_spec.rb +++ b/spec/helpers/projects_helper_spec.rb @@ -503,7 +503,7 @@ describe ProjectsHelper do allow(Gitlab::CurrentSettings.current_application_settings).to receive(:enabled_git_access_protocol) { 'ssh' } allow(Gitlab.config.gitlab_shell).to receive(:ssh_path_prefix).and_return('git@localhost:') - expect(helper.push_to_create_project_command(user)).to eq('git push --set-upstream git@localhost:john/$(git rev-parse --show-toplevel | xargs basename).git $(git rev-parse --abbrev-ref HEAD)') + expect(helper.push_to_create_project_command(user)).to eq("git push --set-upstream #{Gitlab.config.gitlab.user}@localhost:john/$(git rev-parse --show-toplevel | xargs basename).git $(git rev-parse --abbrev-ref HEAD)") end end |