Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 17 deletions

diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index ed6cb3505f4..021d2070b87 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -4,27 +4,27 @@ FactoryBot.define do
   factory :event do
     project
     author(factory: :user) { project.creator }
-    action { Event::JOINED }
-
-    trait(:created)   { action { Event::CREATED } }
-    trait(:updated)   { action { Event::UPDATED } }
-    trait(:closed)    { action { Event::CLOSED } }
-    trait(:reopened)  { action { Event::REOPENED } }
-    trait(:pushed)    { action { Event::PUSHED } }
-    trait(:commented) { action { Event::COMMENTED } }
-    trait(:merged)    { action { Event::MERGED } }
-    trait(:joined)    { action { Event::JOINED } }
-    trait(:left)      { action { Event::LEFT } }
-    trait(:destroyed) { action { Event::DESTROYED } }
-    trait(:expired)   { action { Event::EXPIRED } }
+    action { :joined }
+
+    trait(:created)   { action { :created } }
+    trait(:updated)   { action { :updated } }
+    trait(:closed)    { action { :closed } }
+    trait(:reopened)  { action { :reopened } }
+    trait(:pushed)    { action { :pushed } }
+    trait(:commented) { action { :commented } }
+    trait(:merged)    { action { :merged } }
+    trait(:joined)    { action { :joined } }
+    trait(:left)      { action { :left } }
+    trait(:destroyed) { action { :destroyed } }
+    trait(:expired)   { action { :expired } }
 
     factory :closed_issue_event do
-      action { Event::CLOSED }
+      action { :closed }
       target factory: :closed_issue
     end
 
     factory :wiki_page_event do
-      action { Event::CREATED }
+      action { :created }
       project { @overrides[:wiki_page]&.container || create(:project, :wiki_repo) }
       target { create(:wiki_page_meta, :for_wiki_page, wiki_page: wiki_page) }
 
@@ -39,7 +39,7 @@ FactoryBot.define do
         note { create(:note, author: author, project: project, noteable: design) }
       end
 
-      action { Event::COMMENTED }
+      action { :commented }
       target { note }
     end
   end
@@ -47,7 +47,7 @@ FactoryBot.define do
   factory :push_event, class: 'PushEvent' do
     project factory: :project_empty_repo
     author(factory: :user) { project.creator }
-    action { Event::PUSHED }
+    action { :pushed }
   end
 
   factory :push_event_payload do