From e7527f548681e4f9efd32f9c3da937ad74c68948 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 8 Oct 2021 18:13:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/gitlab/mail_room/mail_room_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'spec/lib/gitlab/mail_room') diff --git a/spec/lib/gitlab/mail_room/mail_room_spec.rb b/spec/lib/gitlab/mail_room/mail_room_spec.rb index a42da4ad3e0..0bd1a27c65e 100644 --- a/spec/lib/gitlab/mail_room/mail_room_spec.rb +++ b/spec/lib/gitlab/mail_room/mail_room_spec.rb @@ -93,7 +93,7 @@ RSpec.describe Gitlab::MailRoom do end describe 'setting up redis settings' do - let(:fake_redis_queues) { double(url: "localhost", sentinels: "yes, them", sentinels?: true) } + let(:fake_redis_queues) { double(url: "localhost", db: 99, sentinels: "yes, them", sentinels?: true) } before do allow(Gitlab::Redis::Queues).to receive(:new).and_return(fake_redis_queues) @@ -103,6 +103,7 @@ RSpec.describe Gitlab::MailRoom do config = described_class.enabled_configs.first expect(config[:redis_url]).to eq('localhost') + expect(config[:redis_db]).to eq(99) expect(config[:sentinels]).to eq('yes, them') end end -- cgit v1.2.3