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

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

diff --git a/test/factories/messages.rb b/test/factories/messages.rb
index 75e65cdbf93c270d11dfd721e0cc571b47250fce..57a434fa1e739fb8ec32ee56922419631d32f95c 100644 (file)
--- a/test/factories/messages.rb
+++ b/test/factories/messages.rb
@@ -1,21 +1,18 @@
-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 }
 
-    # FIXME: needs user factory
-    from_user_id 1
-
-    # FIXME: needs user factory
-    to_user_id 2
+    association :sender, :factory => :user
+    association :recipient, :factory => :user
 
     trait :unread do
-      message_read false
+      message_read { false }
     end
 
     trait :read do
-      message_read true
+      message_read { true }
     end
   end
 end