Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index e954a9495c2cb63a2dda534e7d7648a89e4fb921..22cc0e15c36bf880e219170652cd76e4bdb7a14b 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -29,9 +29,10 @@ class Test::Unit::TestCase
   def self.api_fixtures
     fixtures :users
 
   def self.api_fixtures
     fixtures :users
 

-    fixtures :current_nodes, :nodes
+    fixtures :current_nodes, :nodes, :current_node_tags

     set_fixture_class :current_nodes => :Node
     set_fixture_class :nodes => :OldNode
     set_fixture_class :current_nodes => :Node
     set_fixture_class :nodes => :OldNode

+    set_fixture_class :current_node_tags => :NodeTag

 
     fixtures :current_ways, :current_way_nodes, :current_way_tags
     set_fixture_class :current_ways => :Way
 
     fixtures :current_ways, :current_way_nodes, :current_way_tags
     set_fixture_class :current_ways => :Way