diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/config/mail_room_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/config/mail_room_spec.rb')
-rw-r--r-- | spec/config/mail_room_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb index ce514bd8905..074549ff591 100644 --- a/spec/config/mail_room_spec.rb +++ b/spec/config/mail_room_spec.rb @@ -43,7 +43,7 @@ RSpec.describe 'mail_room.yml' do context 'when both incoming email and service desk email are enabled' do let(:gitlab_config_path) { 'spec/fixtures/config/mail_room_enabled.yml' } - let(:queues_config_path) { 'spec/fixtures/config/redis_queues_new_format_host.yml' } + let(:queues_config_path) { 'spec/fixtures/config/redis_new_format_host.yml' } let(:gitlab_redis_queues) { Gitlab::Redis::Queues.new(Rails.env) } it 'contains the intended configuration' do @@ -72,7 +72,7 @@ RSpec.describe 'mail_room.yml' do context 'when both incoming email and service desk email are enabled for Microsoft Graph' do let(:gitlab_config_path) { 'spec/fixtures/config/mail_room_enabled_ms_graph.yml' } - let(:queues_config_path) { 'spec/fixtures/config/redis_queues_new_format_host.yml' } + let(:queues_config_path) { 'spec/fixtures/config/redis_new_format_host.yml' } let(:gitlab_redis_queues) { Gitlab::Redis::Queues.new(Rails.env) } it 'contains the intended configuration' do |