diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-10 13:02:26 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-10 13:02:26 +0200 |
commit | bed05a1381fab0b7c74817f68aac8e18c60c6a25 (patch) | |
tree | cfc5683f8e9360662562c2146c3a18ceb43ebfef /spec | |
parent | dee11dadad88ed83300c7684aab52e5508f29f24 (diff) | |
download | gitlab-ce-bed05a1381fab0b7c74817f68aac8e18c60c6a25.tar.gz |
Fix submodule_helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/submodule_helper_spec.rb | 77 |
1 files changed, 43 insertions, 34 deletions
diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb index 507812e5223..20378b1b17d 100644 --- a/spec/helpers/submodule_helper_spec.rb +++ b/spec/helpers/submodule_helper_spec.rb @@ -2,8 +2,13 @@ require 'spec_helper' describe SubmoduleHelper do describe 'submodule links' do - let(:submodule_item) { double(submodule_url: '', id: 'hash') } + let(:submodule_item) { double(id: 'hash', path: 'rack') } let(:config) { Gitlab.config.gitlab } + let(:repo) { double() } + + before do + self.instance_variable_set(:@repository, repo) + end context 'submodule on self' do before do @@ -12,28 +17,28 @@ describe SubmoduleHelper do it 'should detect ssh on standard port' do Gitlab.config.gitlab.stub(ssh_port: 22) # set this just to be sure - submodule_item.stub(submodule_url: [ config.user, '@', config.host, ':gitlab-org/gitlab-ce.git' ].join('')) + 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 - + it 'should detect ssh on non-standard port' do Gitlab.config.gitlab_shell.stub(ssh_port: 2222) Gitlab.config.gitlab_shell.stub(ssh_path_prefix: Settings.send(:build_gitlab_shell_ssh_path_prefix)) - submodule_item.stub(submodule_url: [ 'ssh://', config.user, '@', config.host, ':2222/gitlab-org/gitlab-ce.git' ].join('')) + stub_url([ 'ssh://', config.user, '@', config.host, ':2222/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 it 'should detect http on standard port' do Gitlab.config.gitlab.stub(port: 80) Gitlab.config.gitlab.stub(url: Settings.send(:build_gitlab_url)) - submodule_item.stub(submodule_url: [ 'http://', config.host, '/gitlab-org/gitlab-ce.git' ].join('')) + stub_url([ 'http://', 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 it 'should detect http on non-standard port' do Gitlab.config.gitlab.stub(port: 3000) Gitlab.config.gitlab.stub(url: Settings.send(:build_gitlab_url)) - submodule_item.stub(submodule_url: [ 'http://', config.host, ':3000/gitlab-org/gitlab-ce.git' ].join('')) + stub_url([ 'http://', config.host, ':3000/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 @@ -41,69 +46,73 @@ describe SubmoduleHelper do Gitlab.config.gitlab.stub(port: 80) # set this just to be sure Gitlab.config.gitlab.stub(relative_url_root: '/gitlab/root') Gitlab.config.gitlab.stub(url: Settings.send(:build_gitlab_url)) - submodule_item.stub(submodule_url: [ 'http://', config.host, '/gitlab/root/gitlab-org/gitlab-ce.git' ].join('')) + stub_url([ 'http://', config.host, '/gitlab/root/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 end - + context 'submodule on github.com' do it 'should detect ssh' do - submodule_item.stub(submodule_url: 'git@github.com:gitlab-org/gitlab-ce.git') + stub_url('git@github.com:gitlab-org/gitlab-ce.git') submodule_links(submodule_item).should == [ 'https://github.com/gitlab-org/gitlab-ce', 'https://github.com/gitlab-org/gitlab-ce/tree/hash' ] end - + it 'should detect http' do - submodule_item.stub(submodule_url: 'http://github.com/gitlab-org/gitlab-ce.git') + stub_url('http://github.com/gitlab-org/gitlab-ce.git') submodule_links(submodule_item).should == [ 'https://github.com/gitlab-org/gitlab-ce', 'https://github.com/gitlab-org/gitlab-ce/tree/hash' ] end - + it 'should detect https' do - submodule_item.stub(submodule_url: 'https://github.com/gitlab-org/gitlab-ce.git') + stub_url('https://github.com/gitlab-org/gitlab-ce.git') submodule_links(submodule_item).should == [ 'https://github.com/gitlab-org/gitlab-ce', 'https://github.com/gitlab-org/gitlab-ce/tree/hash' ] end - + it 'should return original with non-standard url' do - submodule_item.stub(submodule_url: 'http://github.com/gitlab-org/gitlab-ce') - submodule_links(submodule_item).should == [ submodule_item.submodule_url, nil ] + stub_url('http://github.com/gitlab-org/gitlab-ce') + submodule_links(submodule_item).should == [ repo.submodule_url_for, nil ] - submodule_item.stub(submodule_url: 'http://github.com/another/gitlab-org/gitlab-ce.git') - submodule_links(submodule_item).should == [ submodule_item.submodule_url, nil ] + stub_url('http://github.com/another/gitlab-org/gitlab-ce.git') + submodule_links(submodule_item).should == [ repo.submodule_url_for, nil ] end end - + context 'submodule on gitlab.com' do it 'should detect ssh' do - submodule_item.stub(submodule_url: 'git@gitlab.com:gitlab-org/gitlab-ce.git') + stub_url('git@gitlab.com:gitlab-org/gitlab-ce.git') submodule_links(submodule_item).should == [ 'https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash' ] end - + it 'should detect http' do - submodule_item.stub(submodule_url: 'http://gitlab.com/gitlab-org/gitlab-ce.git') + stub_url('http://gitlab.com/gitlab-org/gitlab-ce.git') submodule_links(submodule_item).should == [ 'https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash' ] end - + it 'should detect https' do - submodule_item.stub(submodule_url: 'https://gitlab.com/gitlab-org/gitlab-ce.git') + stub_url('https://gitlab.com/gitlab-org/gitlab-ce.git') submodule_links(submodule_item).should == [ 'https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash' ] end - + it 'should return original with non-standard url' do - submodule_item.stub(submodule_url: 'http://gitlab.com/gitlab-org/gitlab-ce') - submodule_links(submodule_item).should == [ submodule_item.submodule_url, nil ] + stub_url('http://gitlab.com/gitlab-org/gitlab-ce') + submodule_links(submodule_item).should == [ repo.submodule_url_for, nil ] - submodule_item.stub(submodule_url: 'http://gitlab.com/another/gitlab-org/gitlab-ce.git') - submodule_links(submodule_item).should == [ submodule_item.submodule_url, nil ] + stub_url('http://gitlab.com/another/gitlab-org/gitlab-ce.git') + submodule_links(submodule_item).should == [ repo.submodule_url_for, nil ] end end - + context 'submodule on unsupported' do it 'should return original' do - submodule_item.stub(submodule_url: 'http://mygitserver.com/gitlab-org/gitlab-ce') - submodule_links(submodule_item).should == [ submodule_item.submodule_url, nil ] + stub_url('http://mygitserver.com/gitlab-org/gitlab-ce') + submodule_links(submodule_item).should == [ repo.submodule_url_for, nil ] - submodule_item.stub(submodule_url: 'http://mygitserver.com/gitlab-org/gitlab-ce.git') - submodule_links(submodule_item).should == [ submodule_item.submodule_url, nil ] + stub_url('http://mygitserver.com/gitlab-org/gitlab-ce.git') + submodule_links(submodule_item).should == [ repo.submodule_url_for, nil ] end end end + + def stub_url(url) + repo.stub(submodule_url_for: url) + end end |