Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

2 files changed, 4 insertions, 7 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 0ec805714e3..f7ff68af8a2 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
@@ -48,7 +48,8 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
         'epic_boards_usage',
         'secure',
         'importer',
-        'network_policies'
+        'network_policies',
+        'geo'
       )
     end
   end
diff --git a/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb
index 6f201b43390..1ac344d9250 100644
--- a/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb
@@ -13,10 +13,6 @@ RSpec.describe Gitlab::UsageDataCounters::PackageEventCounter, :clean_gitlab_red
     end
   end
 
-  it 'includes the right events' do
-    expect(described_class::KNOWN_EVENTS.size).to eq 63
-  end
-
   described_class::KNOWN_EVENTS.each do |event|
     it_behaves_like 'usage counter with totals', event
   end
@@ -24,8 +20,8 @@ RSpec.describe Gitlab::UsageDataCounters::PackageEventCounter, :clean_gitlab_red
   describe '.fetch_supported_event' do
     subject { described_class.fetch_supported_event(event_name) }
 
-    let(:event_name) { 'package_events_i_package_composer_push_package' }
+    let(:event_name) { 'package_events_i_package_conan_push_package' }
 
-    it { is_expected.to eq 'i_package_composer_push_package' }
+    it { is_expected.to eq 'i_package_conan_push_package' }
   end
 end