Convert fixtures to factory for old_way_tags

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0baf922704d24af5c7f3ecf7a32ef443868a479e..df01a326a3fa6acc6355b6139a36cb12582d8212 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,19 +8,20 @@ load "composite_primary_keys/fixtures.rb"
 
 module ActiveSupport
   class TestCase
+    include FactoryGirl::Syntax::Methods
+
     # Load standard fixtures needed to test API methods
     def self.api_fixtures
       # print "setting up the api_fixtures"
-      fixtures :users, :user_roles, :user_blocks
-      fixtures :changesets, :changeset_tags, :changeset_comments
+      fixtures :users, :user_roles
+      fixtures :changesets, :changeset_tags
 
       fixtures :current_nodes, :nodes
       set_fixture_class :current_nodes => Node
       set_fixture_class :nodes => OldNode
 
-      fixtures :current_node_tags, :node_tags
+      fixtures :current_node_tags
       set_fixture_class :current_node_tags => NodeTag
-      set_fixture_class :node_tags => OldNodeTag
 
       fixtures :current_ways
       set_fixture_class :current_ways => Way
@@ -32,9 +33,8 @@ module ActiveSupport
       fixtures :ways
       set_fixture_class :ways => OldWay
 
-      fixtures :way_nodes, :way_tags
+      fixtures :way_nodes
       set_fixture_class :way_nodes => OldWayNode
-      set_fixture_class :way_tags => OldWayTag
 
       fixtures :current_relations
       set_fixture_class :current_relations => Relation
@@ -58,8 +58,6 @@ module ActiveSupport
       fixtures :client_applications
 
       fixtures :redactions
-
-      fixtures :notes, :note_comments
     end
 
     ##