Merge branch 'events-migration-cleanup' into 'master'

Finish migration to the new events setup

Closes #37241

See merge request !13932

1 files changed, 4 insertions, 9 deletions

diff --git a/features/steps/user.rb b/features/steps/user.rb
index 59385a6ab59..321c1e942d5 100644
--- a/features/steps/user.rb
+++ b/features/steps/user.rb
@@ -17,14 +17,9 @@ class Spinach::Features::User < Spinach::FeatureSteps
     Issues::CreateService.new(project, user, issue_params).execute
 
     # Push code contribution
-    push_params = {
-      project: project,
-      action: Event::PUSHED,
-      author_id: user.id,
-      data: { commit_count: 3 }
-    }
-
-    Event.create(push_params)
+    event = create(:push_event, project: project, author: user)
+
+    create(:push_event_payload, event: event, commit_count: 3)
   end
 
   step 'I should see contributed projects' do
@@ -38,6 +33,6 @@ class Spinach::Features::User < Spinach::FeatureSteps
   end
 
   def contributed_project
-    @contributed_project ||= create(:project, :public)
+    @contributed_project ||= create(:project, :public, :empty_repo)
   end
 end