Use factories for all factory associations.

diff --git a/test/factories/changeset_tags.rb b/test/factories/changeset_tags.rb
index fa728f085403bb14f43b8187b71371c55876225f..d80f29c7a834b1f56ecbef0ec9d463ee4aeb5dd3 100644 (file)
--- a/test/factories/changeset_tags.rb
+++ b/test/factories/changeset_tags.rb
@@ -3,7 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 

-    # Fixme requires changeset factory
-    changeset_id 1
+    changeset

   end
 end
   end
 end

diff --git a/test/factories/old_node.rb b/test/factories/old_node.rb
index 403ffc0ea04b539c0ad2b4a5fea8463104c5b77d..3eda91a539a0e01b5e84cd056fa2e9c9cff00b25 100644 (file)
--- a/test/factories/old_node.rb
+++ b/test/factories/old_node.rb
@@ -4,9 +4,7 @@ FactoryGirl.define do
     longitude 1 * GeoRecord::SCALE
 
     changeset
     longitude 1 * GeoRecord::SCALE
 
     changeset

-
-    # FIXME: needs node factory
-    node_id 1000
+    association :current_node, :factory => :node

 
     visible true
     timestamp Time.now
 
     visible true
     timestamp Time.now

diff --git a/test/factories/old_node_tags.rb b/test/factories/old_node_tags.rb
index 5c63f324294f0c9d7f5ae81b908a7edc3d4822fe..f74e80702fa5c3c4a3e58890582f236ff19d29c0 100644 (file)
--- a/test/factories/old_node_tags.rb
+++ b/test/factories/old_node_tags.rb
@@ -3,8 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 

-    # Fixme requires old_node factory
-    node_id 1
-    version 1
+    old_node

   end
 end
   end
 end

diff --git a/test/factories/old_relation_tags.rb b/test/factories/old_relation_tags.rb
index 08e4171872d219c091a1a22a515b2d51025877b8..0a83cc6d7d498896a6c51781e2124e126a970e94 100644 (file)
--- a/test/factories/old_relation_tags.rb
+++ b/test/factories/old_relation_tags.rb
@@ -3,8 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 

-    # Fixme requires old_relation factory
-    relation_id 1
-    version 1
+    old_relation

   end
 end
   end
 end

diff --git a/test/factories/old_way_tags.rb b/test/factories/old_way_tags.rb
index c639c06dbe6d61ac733cbb0ffe25425a748063c3..6b3e6cf4785ecb87ac54434285052d17224ed869 100644 (file)
--- a/test/factories/old_way_tags.rb
+++ b/test/factories/old_way_tags.rb
@@ -3,8 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 

-    # Fixme requires old_way factory
-    way_id 1
-    version 1
+    old_way

   end
 end
   end
 end

diff --git a/test/factories/relation_tags.rb b/test/factories/relation_tags.rb
index 00ad4dbdc366442d222248e6545302e52748ef0c..7fe71448d8f5e8d6242d2ac576412b8c3ef67ba2 100644 (file)
--- a/test/factories/relation_tags.rb
+++ b/test/factories/relation_tags.rb
@@ -3,7 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 

-    # Fixme requires relation factory
-    relation_id 1
+    relation

   end
 end
   end
 end

diff --git a/test/factories/user_blocks.rb b/test/factories/user_blocks.rb
index 8f7edaf6e2f4444fda84ca7b1b4fb3fdd04a05d6..f1ef5b65b02a707ce9ec326054e364d1c61faca6 100644 (file)
--- a/test/factories/user_blocks.rb
+++ b/test/factories/user_blocks.rb
@@ -15,8 +15,7 @@ FactoryGirl.define do
     end
 
     trait :revoked do
     end
 
     trait :revoked do

-      # FIXME: requires User factory
-      revoker_id 5
+      association :revoker, :factory => :moderator_user

     end
   end
 end
     end
   end
 end

diff --git a/test/factories/way_tags.rb b/test/factories/way_tags.rb
index 3bc3192f5e3bca899296b6a3ffc6bdd844bf8348..7a60aeea6062d4e36237b9f2ea269eb723748d01 100644 (file)
--- a/test/factories/way_tags.rb
+++ b/test/factories/way_tags.rb
@@ -3,7 +3,6 @@ FactoryGirl.define do
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 
     sequence(:k) { |n| "Key #{n}" }
     sequence(:v) { |n| "Value #{n}" }
 

-    # Fixme requires way factory
-    way_id 1
+    way

   end
 end
   end
 end