Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/support/sidekiq_middleware.rb b/spec/support/sidekiq_middleware.rb
index 1380f4394d8..62f81ef1669 100644
--- a/spec/support/sidekiq_middleware.rb
+++ b/spec/support/sidekiq_middleware.rb
@@ -31,3 +31,16 @@ class DisableQueryLimit
     end
   end
 end
+
+# When running `Sidekiq::Testing.inline!` each job is using a request-store.
+# This middleware makes sure the values don't leak into eachother.
+class IsolatedRequestStore
+  def call(_worker, msg, queue)
+    old_store = RequestStore.store.dup
+    RequestStore.clear!
+
+    yield
+
+    RequestStore.store = old_store
+  end
+end