Remove Redis matchers for internal events

Remove Redis matchers for internal events

ee/spec/services/ci/runners/send_usage_csv_service_spec.rb

@@ -49,11 +49,12 @@
   end
 
   it 'creates tracking event' do
-    expect(Gitlab::InternalEvents).to receive(:track_event)
-      .with('export_runner_usage_by_project_as_csv', user: current_user,
-        additional_properties: { property: 'instance_type', label: 'instance' })
-
-    response
+    expect { response }.to trigger_internal_events('export_runner_usage_by_project_as_csv')
+      .with(
+        category: 'InternalEventTracking',
+        user: current_user,
+        additional_properties: { property: 'instance_type', label: 'instance' }
+      )
   end
 
   it 'creates audit event' do
@@ -130,11 +131,13 @@
       end
 
       it 'creates tracking event' do
-        expect(Gitlab::InternalEvents).to receive(:track_event)
-          .with('export_runner_usage_by_project_as_csv', user: current_user, namespace: specified_scope,
-            additional_properties: { property: 'instance_type', label: 'group' })
-
-        response
+        expect { response }.to trigger_internal_events('export_runner_usage_by_project_as_csv')
+          .with(
+            category: 'InternalEventTracking',
+            user: current_user,
+            namespace: specified_scope,
+            additional_properties: { property: 'instance_type', label: 'group' }
+          )
       end
     end
 
@@ -159,11 +162,13 @@
       end
 
       it 'creates tracking event' do
-        expect(Gitlab::InternalEvents).to receive(:track_event)
-          .with('export_runner_usage_by_project_as_csv', user: current_user, project: specified_scope,
-            additional_properties: { property: 'instance_type', label: 'project' })
-
-        response
+        expect { response }.to trigger_internal_events('export_runner_usage_by_project_as_csv')
+          .with(
+            category: 'InternalEventTracking',
+            user: current_user,
+            project: specified_scope,
+            additional_properties: { property: 'instance_type', label: 'project' }
+          )
       end
     end
   end

spec/support/matchers/internal_events_matchers.rb

@@ -131,7 +131,6 @@ def apply_chain_methods(base_matcher, chained_methods)
       [
         expect_internal_event(event_name),
         expect_snowplow(event_name),
-        expect_redis(event_name),
         expect_product_analytics(event_name)
       ]
     end
@@ -247,18 +246,6 @@ def expect_no_snowplow_event(event_name)
     # rubocop:enable RSpec/ExpectGitlabTracking
   end
 
-  def expect_redis(event_name)
-    Gitlab::InternalEvents::EventDefinitions.unique_properties(event_name).map do |property|
-      expect(Gitlab::Redis::HLL)
-        .to receive_expected_count_of(:add)
-        .with(hash_including(
-          key: a_string_including(event_name),
-          value: @properties.any? ? id_for(property) : anything,
-          expiry: 6.weeks
-        ))
-    end
-  end
-
   def expect_product_analytics(event_name)
     return expect_any_product_analytics_call(event_name) if @properties.none?