Merge rails_port as of r4613 & fix tests.

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index a441122ab931d869f3a456ce2ae6762388c74f6a..f3baf4ff29042fad56614ab21c8bda3b9183b212 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -32,18 +32,14 @@ class Test::Unit::TestCase
     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_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
   end