]> git.openstreetmap.org Git - rails.git/blobdiff - test/factories/user_blocks.rb
Merge branch 'master' into moderation
[rails.git] / test / factories / user_blocks.rb
index b73e599b864757b370adda699951a4fc221a5a43..f1ef5b65b02a707ce9ec326054e364d1c61faca6 100644 (file)
@@ -3,11 +3,8 @@ FactoryGirl.define 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