diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 21:08:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 21:08:46 +0000 |
commit | ee7fba4b844935437233f6c5b74545a28bac4298 (patch) | |
tree | 4f954fb6c51abd3f67edfa22f9eb987cac09eb7f /spec/helpers | |
parent | e0ab7eda1b1013e3246b0db28689b0749158f0bf (diff) | |
download | gitlab-ce-ee7fba4b844935437233f6c5b74545a28bac4298.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/submodule_helper_spec.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb index fcfce0eaf31..8eb40b5975a 100644 --- a/spec/helpers/submodule_helper_spec.rb +++ b/spec/helpers/submodule_helper_spec.rb @@ -8,6 +8,11 @@ describe SubmoduleHelper do let(:submodule_item) { double(id: 'hash', path: 'rack') } let(:config) { Gitlab.config.gitlab } let(:repo) { double } + let(:submodules) { Gitlab::SubmoduleLinks.new(repo) } + + before do + allow(repo).to receive(:submodule_links).and_return(submodules) + end shared_examples 'submodule_links' do context 'submodule on self' do @@ -163,7 +168,7 @@ describe SubmoduleHelper do let(:repo) { double(:repo, project: project) } def expect_relative_link_to_resolve_to(relative_path, expected_path) - allow(repo).to receive(:submodule_url_for).and_return(relative_path) + stub_url(relative_path) result = subject expect(result).to eq([expected_path, "#{expected_path}/tree/#{submodule_item.id}"]) @@ -183,7 +188,7 @@ describe SubmoduleHelper do context 'repo path resolves to be located at root (namespace absent)' do it 'returns nil' do - allow(repo).to receive(:submodule_url_for).and_return('../../test.git') + stub_url('../../test.git') result = subject @@ -193,7 +198,7 @@ describe SubmoduleHelper do context 'repo path resolves to be located underneath current project path' do it 'returns nil because it is not possible to have repo nested under another repo' do - allow(repo).to receive(:submodule_url_for).and_return('./test.git') + stub_url('./test.git') result = subject @@ -263,6 +268,7 @@ describe SubmoduleHelper do end def stub_url(url) + allow(submodules).to receive(:submodule_url_for).and_return(url) allow(repo).to receive(:submodule_url_for).and_return(url) end end |