Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 18 deletions

diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index b15eb1592fc..4eedcd02c9a 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -4,19 +4,19 @@ FactoryBot.define do
   factory :event do
     project
     author(factory: :user) { project.creator }
-    action Event::JOINED
+    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 }
+    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 } }
 
     factory :closed_issue_event do
       action { Event::CLOSED }
@@ -27,15 +27,15 @@ FactoryBot.define do
   factory :push_event, class: PushEvent do
     project factory: :project_empty_repo
     author(factory: :user) { project.creator }
-    action Event::PUSHED
+    action { Event::PUSHED }
   end
 
   factory :push_event_payload do
     event
-    commit_count 1
-    action :pushed
-    ref_type :branch
-    ref 'master'
-    commit_to '3cdce97ed87c91368561584e7358f4d46e3e173c'
+    commit_count { 1 }
+    action { :pushed }
+    ref_type { :branch }
+    ref { 'master' }
+    commit_to { '3cdce97ed87c91368561584e7358f4d46e3e173c' }
   end
 end