Merge branch 'fix-import-helper-spec' into 'master'
Fix import helper spec when a previous spec stubs settings Closes gitlab-ee#5303 See merge request gitlab-org/gitlab-ce!17776
This commit is contained in:
commit
770ba3838c
1 changed files with 2 additions and 4 deletions
|
@ -28,12 +28,10 @@ describe ImportHelper do
|
||||||
describe '#provider_project_link' do
|
describe '#provider_project_link' do
|
||||||
context 'when provider is "github"' do
|
context 'when provider is "github"' do
|
||||||
let(:github_server_url) { nil }
|
let(:github_server_url) { nil }
|
||||||
|
let(:provider) { OpenStruct.new(name: 'github', url: github_server_url) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
setting = Settingslogic.new('name' => 'github')
|
stub_omniauth_setting(providers: [provider])
|
||||||
setting['url'] = github_server_url if github_server_url
|
|
||||||
|
|
||||||
allow(Gitlab.config.omniauth).to receive(:providers).and_return([setting])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when provider does not specify a custom URL' do
|
context 'when provider does not specify a custom URL' do
|
||||||
|
|
Loading…
Reference in a new issue