Merge remote-tracking branch 'upstream/pull/5319'

[rails.git] / test / factories / messages.rb

diff --git a/test/factories/messages.rb b/test/factories/messages.rb
index 9d9c30a48f46c7fe3de0972c9b8875d9f151ba06..906c4dea9fada803fc6e15fe9718c7100ac949d9 100644 (file)
--- a/test/factories/messages.rb
+++ b/test/factories/messages.rb
@@ -1,18 +1,22 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :message do
     sequence(:title) { |n| "Message #{n}" }
     sequence(:body) { |n| "Body text for message #{n}" }
-    sent_on Time.now
+    sent_on { Time.now.utc }
 
-    association :sender, :factory => :user
-    association :recipient, :factory => :user
+    sender :factory => :user
+    recipient :factory => :user
 
     trait :unread do
-      message_read false
+      message_read { false }
     end
 
     trait :read do
-      message_read true
+      message_read { true }
+    end
+
+    trait :muted do
+      muted { true }
     end
   end
 end