Merge branch 'pull/4985'

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

diff --git a/test/factories/messages.rb b/test/factories/messages.rb
index 75e65cdbf93c270d11dfd721e0cc571b47250fce..906c4dea9fada803fc6e15fe9718c7100ac949d9 100644 (file)
--- a/test/factories/messages.rb
+++ b/test/factories/messages.rb
@@ -1,21 +1,22 @@
-FactoryGirl.define do
+FactoryBot.define do

   factory :message do
     sequence(:title) { |n| "Message #{n}" }
     sequence(:body) { |n| "Body text for message #{n}" }
   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 }

 
 

-    # FIXME: needs user factory
-    from_user_id 1
-
-    # FIXME: needs user factory
-    to_user_id 2
+    sender :factory => :user
+    recipient :factory => :user

 
     trait :unread do
 
     trait :unread do

-      message_read false
+      message_read { false }

     end
 
     trait :read do
     end
 
     trait :read do

-      message_read true
+      message_read { true }
+    end
+
+    trait :muted do
+      muted { true }

     end
   end
 end
     end
   end
 end