Add latest changes from gitlab-org/gitlab@master

3 files changed, 40 insertions, 3 deletions

diff --git a/spec/requests/api/terraform/state_spec.rb b/spec/requests/api/terraform/state_spec.rb
index ae1e461d433..f49e799cf5d 100644
--- a/spec/requests/api/terraform/state_spec.rb
+++ b/spec/requests/api/terraform/state_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::Terraform::State do
+RSpec.describe API::Terraform::State, :snowplow do
   include HttpBasicAuthHelpers
 
   let_it_be(:project) { create(:project) }
@@ -25,11 +25,17 @@ RSpec.describe API::Terraform::State do
     context 'without authentication' do
       let(:auth_header) { basic_auth_header('bad', 'token') }
 
-      it 'does not track unique event' do
+      it 'does not track unique hll event' do
         expect(Gitlab::UsageDataCounters::HLLRedisCounter).not_to receive(:track_event)
 
         request
       end
+
+      it 'does not track Snowplow event' do
+        request
+
+        expect_no_snowplow_event
+      end
     end
 
     context 'with maintainer permissions' do
@@ -39,6 +45,29 @@ RSpec.describe API::Terraform::State do
         let(:target_event) { 'p_terraform_state_api_unique_users' }
         let(:expected_value) { instance_of(Integer) }
       end
+
+      it 'tracks Snowplow event' do
+        request
+
+        expect_snowplow_event(
+          category: described_class.to_s,
+          action: 'p_terraform_state_api_unique_users',
+          namespace: project.namespace.reload,
+          user: current_user
+        )
+      end
+
+      context 'when route_hll_to_snowplow_phase2 FF is disabled' do
+        before do
+          stub_feature_flags(route_hll_to_snowplow_phase2: false)
+        end
+
+        it 'does not track Snowplow event' do
+          request
+
+          expect_no_snowplow_event
+        end
+      end
     end
   end
 
diff --git a/spec/support/helpers/callouts_test_helper.rb b/spec/support/helpers/callouts_test_helper.rb
new file mode 100644
index 00000000000..8c7faa71d9f
--- /dev/null
+++ b/spec/support/helpers/callouts_test_helper.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module CalloutsTestHelper
+  def callouts_trials_link_path
+    '/-/trial_registrations/new?glm_content=gold-callout&glm_source=gitlab.com'
+  end
+end
+
+CalloutsTestHelper.prepend_mod
diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb
index b1532b01d3f..ea8b37b59c4 100644
--- a/spec/workers/every_sidekiq_worker_spec.rb
+++ b/spec/workers/every_sidekiq_worker_spec.rb
@@ -405,7 +405,6 @@ RSpec.describe 'Every Sidekiq worker' do
         'RepositoryForkWorker' => 5,
         'RepositoryImportWorker' => false,
         'RepositoryUpdateMirrorWorker' => false,
-        'RepositoryPushAuditEventWorker' => 3,
         'RepositoryUpdateRemoteMirrorWorker' => 3,
         'RequirementsManagement::ImportRequirementsCsvWorker' => 3,
         'RequirementsManagement::ProcessRequirementsReportsWorker' => 3,