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

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

diff --git a/test/factories/user_blocks.rb b/test/factories/user_blocks.rb
index 8f7edaf6e2f4444fda84ca7b1b4fb3fdd04a05d6..d206511b4616c7053e2d3b7c49e9e8895f5db7be 100644 (file)
--- a/test/factories/user_blocks.rb
+++ b/test/factories/user_blocks.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_block do
     sequence(:reason) { |n| "User Block #{n}" }
     ends_at Time.now + 1.day
@@ -15,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