From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Jun 2021 18:25:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee --- spec/config/mail_room_spec.rb | 4 ++-- spec/config/metrics/aggregates/aggregated_metrics_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'spec/config') 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 diff --git a/spec/config/metrics/aggregates/aggregated_metrics_spec.rb b/spec/config/metrics/aggregates/aggregated_metrics_spec.rb index 9aba86cdaf2..b5f8d363d40 100644 --- a/spec/config/metrics/aggregates/aggregated_metrics_spec.rb +++ b/spec/config/metrics/aggregates/aggregated_metrics_spec.rb @@ -25,9 +25,9 @@ RSpec.describe 'aggregated metrics' do RSpec::Matchers.define :have_known_time_frame do allowed_time_frames = [ - Gitlab::Utils::UsageData::ALL_TIME_TIME_FRAME_NAME, - Gitlab::Utils::UsageData::TWENTY_EIGHT_DAYS_TIME_FRAME_NAME, - Gitlab::Utils::UsageData::SEVEN_DAYS_TIME_FRAME_NAME + Gitlab::Usage::TimeFrame::ALL_TIME_TIME_FRAME_NAME, + Gitlab::Usage::TimeFrame::TWENTY_EIGHT_DAYS_TIME_FRAME_NAME, + Gitlab::Usage::TimeFrame::SEVEN_DAYS_TIME_FRAME_NAME ] match do |aggregate| @@ -63,7 +63,7 @@ RSpec.describe 'aggregated metrics' do let_it_be(:events_records) { known_events.select { |event| aggregate[:events].include?(event[:name]) } } it "does not include 'all' time frame for Redis sourced aggregate" do - expect(aggregate[:time_frame]).not_to include(Gitlab::Utils::UsageData::ALL_TIME_TIME_FRAME_NAME) + expect(aggregate[:time_frame]).not_to include(Gitlab::Usage::TimeFrame::ALL_TIME_TIME_FRAME_NAME) end it "only refers to known events" do -- cgit v1.2.1