Skip to content
Snippets Groups Projects
Commit b003ead8 authored by David Kim's avatar David Kim :dart:
Browse files

Merge branch '767-fix-sidekiq-config-test' into 'master'

Fix sidekiq config test

See merge request gitlab-org/gitlab!87349
parents 01990faa 487b0e06
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -60,6 +60,7 @@ RSpec.describe Gitlab::SidekiqConfig do
 
before do
allow(described_class).to receive(:workers).and_return(workers)
allow(Gitlab).to receive(:jh?).and_return(false)
 
allow(YAML).to receive(:load_file)
.with(described_class::FOSS_QUEUE_CONFIG_PATH)
Loading
Loading
Loading
Loading
@@ -49,9 +49,10 @@ RSpec.describe Gitlab::SidekiqConfig do
before do
allow(described_class).to receive(:workers).and_return(workers)
allow(Gitlab).to receive(:ee?).and_return(false)
allow(Gitlab).to receive(:jh?).and_return(false)
end
 
it 'returns true if the YAML file does not matcph the application code' do
it 'returns true if the YAML file does not match the application code' do
allow(YAML).to receive(:load_file)
.with(described_class::FOSS_QUEUE_CONFIG_PATH)
.and_return(workers.first(2).map(&:to_yaml))
Loading
Loading
@@ -101,6 +102,7 @@ RSpec.describe Gitlab::SidekiqConfig do
].map { |worker| described_class::Worker.new(worker, ee: false) }
 
allow(described_class).to receive(:workers).and_return(workers)
allow(Gitlab).to receive(:jh?).and_return(false)
end
 
let(:expected_queues) do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment