Add latest changes from gitlab-org/gitlab@16-8-stable-eev16.8.0-rc42

1 files changed, 8 insertions, 2 deletions

diff --git a/spec/support/sidekiq.rb b/spec/support/sidekiq.rb
index b25f39c5e74..6c354c780b2 100644
--- a/spec/support/sidekiq.rb
+++ b/spec/support/sidekiq.rb
@@ -1,13 +1,19 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
-  def gitlab_sidekiq_inline(&block)
+  def gitlab_sidekiq_inline
     # We need to cleanup the queues before running jobs in specs because the
     # middleware might have written to redis
     redis_queues_cleanup!
     redis_queues_metadata_cleanup!
-    Sidekiq::Testing.inline!(&block)
+
+    # Scoped inline! is thread-safe which breaks capybara specs
+    # see https://github.com/sidekiq/sidekiq/issues/6069
+    Sidekiq::Testing.inline!
+
+    yield
   ensure
+    Sidekiq::Testing.fake! # fake is the default so we reset it to that
     redis_queues_cleanup!
     redis_queues_metadata_cleanup!
   end