Fixed node functional tests. A couple of changes to the old_node model and node contr...

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index a441122ab931d869f3a456ce2ae6762388c74f6a..0c03aac346110dff5fa567188a9b514c285103d0 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
+load 'composite_primary_keys/fixtures.rb'
 
 class Test::Unit::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method
@@ -26,25 +27,35 @@ class Test::Unit::TestCase
 
   # Load standard fixtures needed to test API methods
   def self.api_fixtures
-    fixtures :users
+    fixtures :users, :changesets
 
     fixtures :current_nodes, :nodes
     set_fixture_class :current_nodes => :Node
     set_fixture_class :nodes => :OldNode
 
-    fixtures :current_segments, :segments
-    set_fixture_class :current_segments => :Segment
-    set_fixture_class :segments => :OldSegment
+    fixtures  :current_node_tags,:node_tags
+    set_fixture_class :current_node_tags => :NodeTag
+    set_fixture_class :node_tags => :OldNodeTag
 
-    fixtures :current_ways, :current_way_segments, :current_way_tags
+    fixtures :current_ways, :current_way_nodes, :current_way_tags
     set_fixture_class :current_ways => :Way
-    set_fixture_class :current_way_segments => :WaySegment
+    set_fixture_class :current_way_nodes => :WayNode
     set_fixture_class :current_way_tags => :WayTag
 
-    fixtures :ways, :way_segments, :way_tags
+    fixtures :ways, :way_nodes, :way_tags
     set_fixture_class :ways => :OldWay
-    set_fixture_class :way_segments => :OldWaySegment
+    set_fixture_class :way_nodes => :OldWayNode
     set_fixture_class :way_tags => :OldWayTag
+
+    fixtures :current_relations, :current_relation_members, :current_relation_tags
+    set_fixture_class :current_relations => :Relation
+    set_fixture_class :current_relation_members => :RelationMember
+    set_fixture_class :current_relation_tags => :RelationTag
+
+    fixtures :relations, :relation_members, :relation_tags
+    set_fixture_class :relations => :OldRelation
+    set_fixture_class :relation_members => :OldRelationMember
+    set_fixture_class :relation_tags => :OldRelationTag
   end
 
   # Add more helper methods to be used by all tests here...