Commit 497c856b authored by Stan Hu's avatar Stan Hu

Merge branch '207531-fix-spec-failure' into 'master'

Fix WebMock::NetConnectNotAllowedError spec failure

Closes #207531

See merge request gitlab-org/gitlab!25713
parents af204e96 f5e9c261
...@@ -11,6 +11,7 @@ describe 'admin/application_settings/integrations.html.haml' do ...@@ -11,6 +11,7 @@ describe 'admin/application_settings/integrations.html.haml' do
before do before do
assign(:application_setting, app_settings) assign(:application_setting, app_settings)
allow(Gitlab::Sourcegraph).to receive(:feature_available?).and_return(sourcegraph_flag) allow(Gitlab::Sourcegraph).to receive(:feature_available?).and_return(sourcegraph_flag)
allow(License).to receive(:feature_available?).with(:elastic_search).and_return(false) if defined?(License)
end end
context 'when sourcegraph feature is enabled' do context 'when sourcegraph feature is enabled' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment