Merge branch 'local-test-failures' into 'master'
git-user-related local test failures See merge request gitlab-org/gitlab-ce!31437
This commit is contained in:
commit
b51770c66a
2 changed files with 2 additions and 2 deletions
|
@ -503,7 +503,7 @@ describe ProjectsHelper do
|
||||||
allow(Gitlab::CurrentSettings.current_application_settings).to receive(:enabled_git_access_protocol) { 'ssh' }
|
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:')
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -202,7 +202,7 @@ describe Gitlab::Middleware::Go do
|
||||||
def expect_response_with_path(response, protocol, path)
|
def expect_response_with_path(response, protocol, path)
|
||||||
repository_url = case protocol
|
repository_url = case protocol
|
||||||
when :ssh
|
when :ssh
|
||||||
"ssh://git@#{Gitlab.config.gitlab.host}/#{path}.git"
|
"ssh://#{Gitlab.config.gitlab.user}@#{Gitlab.config.gitlab.host}/#{path}.git"
|
||||||
when :http, nil
|
when :http, nil
|
||||||
"http://#{Gitlab.config.gitlab.host}/#{path}.git"
|
"http://#{Gitlab.config.gitlab.host}/#{path}.git"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue