diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 12:10:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 12:10:07 +0300 |
commit | 8f2b51af416f4f4451632f6b3c2ada52c52eb44f (patch) | |
tree | 5e134df670cf056f300b887c3999f4aa84ec6f24 /spec/lib | |
parent | 86fa823611b3ab5701d144aca1c57c51b4af25d5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb | 24 | ||||
-rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 6 |
2 files changed, 18 insertions, 12 deletions
diff --git a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb index f881da71251..6d4f52974aa 100644 --- a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb +++ b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb @@ -238,16 +238,20 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s it 'returns the number of unique events for all known events' do results = { - 'category1' => { - 'event1_slot' => 1, - 'event2_slot' => 1, - 'category1_total_unique_counts_weekly' => 2, - 'category1_total_unique_counts_monthly' => 3 - }, - 'category2' => { - 'event3' => 1, - 'event4' => 1 - } + "category1" => { + "event1_slot_weekly" => 1, + "event1_slot_monthly" => 1, + "event2_slot_weekly" => 1, + "event2_slot_monthly" => 2, + "category1_total_unique_counts_weekly" => 2, + "category1_total_unique_counts_monthly" => 3 + }, + "category2" => { + "event3_weekly" => 1, + "event3_monthly" => 1, + "event4_weekly" => 1, + "event4_monthly" => 1 + } } expect(subject.unique_events_data).to eq(results) diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index d3fb26c0a0a..5a54b29edc3 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -1186,11 +1186,13 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do categories.each do |category| keys = ::Gitlab::UsageDataCounters::HLLRedisCounter.events_for_category(category) + metrics = keys.map { |key| "#{key}_weekly" } + keys.map { |key| "#{key}_monthly" } + if ineligible_total_categories.exclude?(category) - keys.append("#{category}_total_unique_counts_weekly", "#{category}_total_unique_counts_monthly") + metrics.append("#{category}_total_unique_counts_weekly", "#{category}_total_unique_counts_monthly") end - expect(subject[:redis_hll_counters][category].keys).to match_array(keys) + expect(subject[:redis_hll_counters][category].keys).to match_array(metrics) end end end |