diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
| commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
| tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /spec/rack_servers | |
| parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'spec/rack_servers')
| -rw-r--r-- | spec/rack_servers/puma_spec.rb | 2 | ||||
| -rw-r--r-- | spec/rack_servers/unicorn_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/rack_servers/puma_spec.rb b/spec/rack_servers/puma_spec.rb index 80595b267fa..6729119fe92 100644 --- a/spec/rack_servers/puma_spec.rb +++ b/spec/rack_servers/puma_spec.rb @@ -44,7 +44,7 @@ RSpec.describe 'Puma' do end after(:all) do - WebMock.disable_net_connect!(allow_localhost: true) + webmock_enable! Process.kill('TERM', @puma_master_pid) rescue Errno::ESRCH end diff --git a/spec/rack_servers/unicorn_spec.rb b/spec/rack_servers/unicorn_spec.rb index 5887b49d269..52d44b6e7e0 100644 --- a/spec/rack_servers/unicorn_spec.rb +++ b/spec/rack_servers/unicorn_spec.rb @@ -68,7 +68,7 @@ RSpec.describe 'Unicorn' do end after(:all) do - WebMock.disable_net_connect!(allow_localhost: true) + webmock_enable! Process.kill('TERM', @unicorn_master_pid) end |