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

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

diff --git a/test/factories/user_blocks.rb b/test/factories/user_blocks.rb
index b73e599b864757b370adda699951a4fc221a5a43..d206511b4616c7053e2d3b7c49e9e8895f5db7be 100644 (file)
--- a/test/factories/user_blocks.rb
+++ b/test/factories/user_blocks.rb
@@ -1,13 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_block do
     sequence(:reason) { |n| "User Block #{n}" }
     ends_at Time.now + 1.day
 
-    # FIXME: requires User factory
-    user_id 13
-
-    # FIXME: requires User factory
-    creator_id 15
+    user
+    association :creator, :factory => :moderator_user
 
     trait :needs_view do
       needs_view true
@@ -18,8 +15,7 @@ FactoryGirl.define do
     end
 
     trait :revoked do
-      # FIXME: requires User factory
-      revoker_id 5
+      association :revoker, :factory => :moderator_user
     end
   end
 end