diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
commit | 76623c12c136f43f24c3966ed4b469e2c0b434b7 (patch) | |
tree | 7c5ec884c25e03e4fea131a4d112a9d0ccfd59b8 /spec/support/sidekiq.rb | |
parent | b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/sidekiq.rb')
-rw-r--r-- | spec/support/sidekiq.rb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/spec/support/sidekiq.rb b/spec/support/sidekiq.rb index a6d6d5fc6e1..9fa8df39019 100644 --- a/spec/support/sidekiq.rb +++ b/spec/support/sidekiq.rb @@ -1,30 +1,14 @@ # frozen_string_literal: true RSpec.configure do |config| - config.around(:each, :sidekiq) do |example| - Sidekiq::Worker.clear_all - example.run - Sidekiq::Worker.clear_all - end - - config.after(:each, :sidekiq, :redis) do - Sidekiq.redis do |connection| - connection.redis.flushdb - end - end - # As we'll review the examples with this tag, we should either: # - fix the example to not require Sidekiq inline mode (and remove this tag) # - explicitly keep the inline mode and change the tag for `:sidekiq_inline` instead config.around(:example, :sidekiq_might_not_need_inline) do |example| - Sidekiq::Worker.clear_all Sidekiq::Testing.inline! { example.run } - Sidekiq::Worker.clear_all end config.around(:example, :sidekiq_inline) do |example| - Sidekiq::Worker.clear_all Sidekiq::Testing.inline! { example.run } - Sidekiq::Worker.clear_all end end |