User factory associations for all factories.

test/factories/changeset_comments.rb

@@ -6,7 +6,6 @@ FactoryGirl.define do
     # FIXME: needs changeset factory
     changeset_id 3
 
-    # FIXME: needs user factory
-    author_id 1
+    association :author, :factory => :user
   end
 end

test/factories/diary_comments.rb

@@ -3,8 +3,6 @@ FactoryGirl.define do
     sequence(:body) { |n| "This is diary comment #{n}" }
 
     diary_entry
-
-    # Fixme requires User Factory
-    user_id 1
+    user
   end
 end

test/factories/diary_entries.rb

@@ -3,7 +3,6 @@ FactoryGirl.define do
     sequence(:title) { |n| "Diary entry #{n}" }
     sequence(:body) { |n| "This is diary entry #{n}" }
 
-    # Fixme requires User Factory
-    user_id 1
+    user
   end
 end

test/factories/friends.rb

@@ -1,7 +1,6 @@
 FactoryGirl.define do
   factory :friend do
-    # Fixme requires User Factory
-    user_id 1
-    friend_user_id 2
+    association :befriender, :factory => :user
+    association :befriendee, :factory => :user
   end
 end

test/factories/messages.rb

@@ -4,11 +4,8 @@ FactoryGirl.define do
     sequence(:body) { |n| "Body text for message #{n}" }
     sent_on Time.now
 
-    # FIXME: needs user factory
-    from_user_id 1
-
-    # FIXME: needs user factory
-    to_user_id 2
+    association :sender, :factory => :user
+    association :recipient, :factory => :user
 
     trait :unread do
       message_read false

test/factories/traces.rb

@@ -3,8 +3,7 @@ FactoryGirl.define do
     sequence(:name) { |n| "Trace #{n}.gpx" }
     sequence(:description) { |n| "This is trace #{n}" }
 
-    # Fixme requires User Factory
-    user_id 1
+    user
 
     timestamp Time.now
     inserted true

test/factories/user_blocks.rb

@@ -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

test/factories/user_preferences.rb

@@ -3,7 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
-    # FIXME: needs user factory
-    user_id 1
+    user
   end
 end