From 26b7ec2c6a7ffb01850dbecb0930b4f9412fe0f2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Dec 2021 15:13:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/sidekiq_cluster/sidekiq_cluster_spec.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'spec/sidekiq_cluster') diff --git a/spec/sidekiq_cluster/sidekiq_cluster_spec.rb b/spec/sidekiq_cluster/sidekiq_cluster_spec.rb index 86b3fc6a48c..c0a919a4aec 100644 --- a/spec/sidekiq_cluster/sidekiq_cluster_spec.rb +++ b/spec/sidekiq_cluster/sidekiq_cluster_spec.rb @@ -13,6 +13,8 @@ RSpec.describe Gitlab::SidekiqCluster do # rubocop:disable RSpec/FilePath out: $stdout } + expect(Bundler).to receive(:with_original_env).and_call_original.twice + expect(Process).to receive(:spawn).ordered.with({ "ENABLE_SIDEKIQ_CLUSTER" => "1", "SIDEKIQ_WORKER_ID" => "0" -- cgit v1.2.3