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

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

diff --git a/test/factories/messages.rb b/test/factories/messages.rb
index 9d9c30a48f46c7fe3de0972c9b8875d9f151ba06..cd148c7896a2f80720258ab27262a66127a767a4 100644 (file)
--- a/test/factories/messages.rb
+++ b/test/factories/messages.rb
@@ -1,18 +1,18 @@
-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 }

 
     association :sender, :factory => :user
     association :recipient, :factory => :user
 
     trait :unread do
 
     association :sender, :factory => :user
     association :recipient, :factory => :user
 
     trait :unread do

-      message_read false
+      message_read { false }

     end
 
     trait :read do
     end
 
     trait :read do

-      message_read true
+      message_read { true }

     end
   end
 end
     end
   end
 end