Add latest changes from gitlab-org/gitlab@15-11-stable-eev15.11.0-rc42

1 files changed, 23 insertions, 17 deletions

diff --git a/spec/models/analytics/cycle_analytics/stage_spec.rb b/spec/models/analytics/cycle_analytics/stage_spec.rb
index 57748f8942e..44c0be68fe3 100644
--- a/spec/models/analytics/cycle_analytics/stage_spec.rb
+++ b/spec/models/analytics/cycle_analytics/stage_spec.rb
@@ -105,30 +105,36 @@ RSpec.describe Analytics::CycleAnalytics::Stage, feature_category: :value_stream
       }
     end
 
-    describe '#create' do
-      it_behaves_like 'Snowplow event tracking' do
-        let(:property) { 'create' }
-        let(:extra) { record_tracked_attributes }
+    context 'with database event tracking' do
+      before do
+        allow(Gitlab::Tracking).to receive(:database_event).and_call_original
+      end
+
+      describe '#create' do
+        it_behaves_like 'Snowplow event tracking', overrides: { tracking_method: :database_event } do
+          let(:property) { 'create' }
+          let(:extra) { record_tracked_attributes }
 
-        subject(:new_group_stage) { stage }
+          subject(:new_group_stage) { stage }
+        end
       end
-    end
 
-    describe '#update', :freeze_time do
-      it_behaves_like 'Snowplow event tracking' do
-        subject(:create_group_stage) { stage.update!(name: 'st 2') }
+      describe '#update', :freeze_time do
+        it_behaves_like 'Snowplow event tracking', overrides: { tracking_method: :database_event } do
+          subject(:create_group_stage) { stage.update!(name: 'st 2') }
 
-        let(:extra) { record_tracked_attributes.merge('name' => 'st 2') }
-        let(:property) { 'update' }
+          let(:extra) { record_tracked_attributes.merge('name' => 'st 2') }
+          let(:property) { 'update' }
+        end
       end
-    end
 
-    describe '#destroy' do
-      it_behaves_like 'Snowplow event tracking' do
-        subject(:delete_stage_group) { stage.destroy! }
+      describe '#destroy' do
+        it_behaves_like 'Snowplow event tracking', overrides: { tracking_method: :database_event } do
+          subject(:delete_stage_group) { stage.destroy! }
 
-        let(:extra) { record_tracked_attributes }
-        let(:property) { 'destroy' }
+          let(:extra) { record_tracked_attributes }
+          let(:property) { 'destroy' }
+        end
       end
     end
   end