diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-06-02 10:51:22 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-06-03 11:37:23 +0200 |
| commit | 1dca950c2831bbe37c7d421ae2033aca4cfc4334 (patch) | |
| tree | 8298d42d15eab344c05cbd126921b9409e4a3c14 /spec/helpers | |
| parent | 9abee4eac80852be502f1cc35cedae063d314e45 (diff) | |
| download | gitlab-ce-1dca950c2831bbe37c7d421ae2033aca4cfc4334.tar.gz | |
Fix failing submodule test.
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/submodule_helper_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb index 20378b1b17d..41c9f038c26 100644 --- a/spec/helpers/submodule_helper_spec.rb +++ b/spec/helpers/submodule_helper_spec.rb @@ -16,7 +16,8 @@ describe SubmoduleHelper do end it 'should detect ssh on standard port' do - Gitlab.config.gitlab.stub(ssh_port: 22) # set this just to be sure + Gitlab.config.gitlab_shell.stub(ssh_port: 22) # set this just to be sure + Gitlab.config.gitlab_shell.stub(ssh_path_prefix: Settings.send(:build_gitlab_shell_ssh_path_prefix)) stub_url([ config.user, '@', config.host, ':gitlab-org/gitlab-ce.git' ].join('')) submodule_links(submodule_item).should == [ project_path('gitlab-org/gitlab-ce'), project_tree_path('gitlab-org/gitlab-ce', 'hash') ] end |