Commit 1dca950c2831bbe37c7d421ae2033aca4cfc4334
1 parent
9abee4ea
Exists in
spb-stable
and in
2 other branches
Fix failing submodule test.
Showing
1 changed file
with
2 additions
and
1 deletions
Show diff stats
spec/helpers/submodule_helper_spec.rb
| ... | ... | @@ -16,7 +16,8 @@ describe SubmoduleHelper do |
| 16 | 16 | end |
| 17 | 17 | |
| 18 | 18 | it 'should detect ssh on standard port' do |
| 19 | - Gitlab.config.gitlab.stub(ssh_port: 22) # set this just to be sure | |
| 19 | + Gitlab.config.gitlab_shell.stub(ssh_port: 22) # set this just to be sure | |
| 20 | + Gitlab.config.gitlab_shell.stub(ssh_path_prefix: Settings.send(:build_gitlab_shell_ssh_path_prefix)) | |
| 20 | 21 | stub_url([ config.user, '@', config.host, ':gitlab-org/gitlab-ce.git' ].join('')) |
| 21 | 22 | submodule_links(submodule_item).should == [ project_path('gitlab-org/gitlab-ce'), project_tree_path('gitlab-org/gitlab-ce', 'hash') ] |
| 22 | 23 | end | ... | ... |