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 f3baf4ff29042fad56614ab21c8bda3b9183b212..22cc0e15c36bf880e219170652cd76e4bdb7a14b 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'
 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
 
 class Test::Unit::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method


@@ -28,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


@@ -41,6 +43,16 @@ class Test::Unit::TestCase
     set_fixture_class :ways => :OldWay
     set_fixture_class :way_nodes => :OldWayNode
     set_fixture_class :way_tags => :OldWayTag
     set_fixture_class :ways => :OldWay
     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...
   end
 
   # Add more helper methods to be used by all tests here...