Commit af1dad5b authored by Markus Koller's avatar Markus Koller

Reenable WebMock with correct settings

parent 93233c54
...@@ -44,7 +44,7 @@ RSpec.describe 'Puma' do ...@@ -44,7 +44,7 @@ RSpec.describe 'Puma' do
end end
after(:all) do after(:all) do
WebMock.disable_net_connect!(allow_localhost: true) webmock_enable!
Process.kill('TERM', @puma_master_pid) Process.kill('TERM', @puma_master_pid)
rescue Errno::ESRCH rescue Errno::ESRCH
end end
......
...@@ -68,7 +68,7 @@ RSpec.describe 'Unicorn' do ...@@ -68,7 +68,7 @@ RSpec.describe 'Unicorn' do
end end
after(:all) do after(:all) do
WebMock.disable_net_connect!(allow_localhost: true) webmock_enable!
Process.kill('TERM', @unicorn_master_pid) Process.kill('TERM', @unicorn_master_pid)
end end
......
...@@ -6,7 +6,7 @@ RSpec.describe 'admin/application_settings/general.html.haml' do ...@@ -6,7 +6,7 @@ RSpec.describe 'admin/application_settings/general.html.haml' do
let(:app_settings) { build(:application_setting) } let(:app_settings) { build(:application_setting) }
let(:user) { create(:admin) } let(:user) { create(:admin) }
describe 'sourcegraph integration', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/296933' } do describe 'sourcegraph integration' do
let(:sourcegraph_flag) { true } let(:sourcegraph_flag) { true }
before do before 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