Use factories for all factory associations.

test/factories/changeset_tags.rb

@@ -3,7 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
-    # Fixme requires changeset factory
-    changeset_id 1
+    changeset
   end
 end

test/factories/old_node.rb

@@ -4,9 +4,7 @@ FactoryGirl.define do
     longitude 1 * GeoRecord::SCALE
 
     changeset
-
-    # FIXME: needs node factory
-    node_id 1000
+    association :current_node, :factory => :node
 
     visible true
     timestamp Time.now

test/factories/old_node_tags.rb

@@ -3,8 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
-    # Fixme requires old_node factory
-    node_id 1
-    version 1
+    old_node
   end
 end

test/factories/old_relation_tags.rb

@@ -3,8 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
-    # Fixme requires old_relation factory
-    relation_id 1
-    version 1
+    old_relation
   end
 end

test/factories/old_way_tags.rb

@@ -3,8 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
-    # Fixme requires old_way factory
-    way_id 1
-    version 1
+    old_way
   end
 end

test/factories/relation_tags.rb

@@ -3,7 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
-    # Fixme requires relation factory
-    relation_id 1
+    relation
   end
 end

test/factories/user_blocks.rb

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

test/factories/way_tags.rb

@@ -3,7 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
-    # Fixme requires way factory
-    way_id 1
+    way
   end
 end