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

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

diff --git a/test/factories/user_blocks.rb b/test/factories/user_blocks.rb
index 8f7edaf6e2f4444fda84ca7b1b4fb3fdd04a05d6..fefbba45ace1b61fbd3932ea1851ba6e5a69fd67 100644 (file)
--- a/test/factories/user_blocks.rb
+++ b/test/factories/user_blocks.rb
@@ -1,22 +1,21 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_block do
     sequence(:reason) { |n| "User Block #{n}" }
-    ends_at Time.now + 1.day
+    ends_at { Time.now.utc + 1.day }
 
     user
     association :creator, :factory => :moderator_user
 
     trait :needs_view do
-      needs_view true
+      needs_view { true }
     end
 
     trait :expired do
-      ends_at Time.now - 1.day
+      ends_at { Time.now.utc - 1.day }
     end
 
     trait :revoked do
-      # FIXME: requires User factory
-      revoker_id 5
+      association :revoker, :factory => :moderator_user
     end
   end
 end