Commit 7a92220a authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'restore_sidekiq_server_middleware' into 'master'

Restore sidekiq middleware to original after specs

Closes #103371

See merge request gitlab-org/gitlab!21798
parents b4ee6827 d90e1713
...@@ -25,6 +25,14 @@ describe Gitlab::SidekiqMiddleware do ...@@ -25,6 +25,14 @@ describe Gitlab::SidekiqMiddleware do
# 1) not failing # 1) not failing
# 2) yielding exactly once # 2) yielding exactly once
describe '.server_configurator' do describe '.server_configurator' do
around do |example|
original = Sidekiq::Testing.server_middleware.dup
example.run
Sidekiq::Testing.instance_variable_set :@server_chain, original
end
let(:middleware_expected_args) { [a_kind_of(worker_class), hash_including({ 'args' => job_args }), anything] } let(:middleware_expected_args) { [a_kind_of(worker_class), hash_including({ 'args' => job_args }), anything] }
let(:all_sidekiq_middlewares) do let(:all_sidekiq_middlewares) 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