diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /spec/config/mail_room_spec.rb | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'spec/config/mail_room_spec.rb')
-rw-r--r-- | spec/config/mail_room_spec.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb index 074549ff591..55f8fdd78ba 100644 --- a/spec/config/mail_room_spec.rb +++ b/spec/config/mail_room_spec.rb @@ -26,11 +26,11 @@ RSpec.describe 'mail_room.yml' do before do stub_env('GITLAB_REDIS_QUEUES_CONFIG_FILE', absolute_path(queues_config_path)) - clear_queues_raw_config + redis_clear_raw_config!(Gitlab::Redis::Queues) end after do - clear_queues_raw_config + redis_clear_raw_config!(Gitlab::Redis::Queues) end context 'when incoming email is disabled' do @@ -103,12 +103,6 @@ RSpec.describe 'mail_room.yml' do end end - def clear_queues_raw_config - Gitlab::Redis::Queues.remove_instance_variable(:@_raw_config) - rescue NameError - # raised if @_raw_config was not set; ignore - end - def absolute_path(path) Rails.root.join(path).to_s end |