Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-16 06:07:29 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-16 06:07:29 +0300
commitf698fdbdcb4482adf2b5ead68be09355ae24e322 (patch)
tree9f7b9dd81dbd81f08682ace1467e975c24bc5c42 /spec/lib/gitlab/sidekiq_middleware_spec.rb
parent6af29c941af34330dd4f9ed9c513823d8067243b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/sidekiq_middleware_spec.rb')
-rw-r--r--spec/lib/gitlab/sidekiq_middleware_spec.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/lib/gitlab/sidekiq_middleware_spec.rb b/spec/lib/gitlab/sidekiq_middleware_spec.rb
index 43b77fdf94a..aef472e0648 100644
--- a/spec/lib/gitlab/sidekiq_middleware_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware_spec.rb
@@ -25,6 +25,14 @@ describe Gitlab::SidekiqMiddleware do
# 1) not failing
# 2) yielding exactly once
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(:all_sidekiq_middlewares) do
[