X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78b440ffc1e0448f8a6d73c8821dd58634ffb475..df496b44cd5d52f96bd090815f4f23b4e0f4452f:/test/test_helper.rb?ds=sidebyside

diff --git a/test/test_helper.rb b/test/test_helper.rb
index f3baf4ff2..63567cc9b 100644
--- 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,12 +27,16 @@ 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_node_tags,:node_tags
+    set_fixture_class :current_node_tags => :NodeTag
+    set_fixture_class :node_tags => :OldNodeTag
+
     fixtures :current_ways, :current_way_nodes, :current_way_tags
     set_fixture_class :current_ways => :Way
     set_fixture_class :current_way_nodes => :WayNode
@@ -41,6 +46,30 @@ class Test::Unit::TestCase
     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
+
+  ##
+  # takes a block which is executed in the context of a different 
+  # ActionController instance. this is used so that code can call methods
+  # on the node controller whilst testing the old_node controller.
+  def with_controller(new_controller)
+    controller_save = @controller
+    begin
+      @controller = new_controller
+      yield
+    ensure
+      @controller = controller_save
+    end
   end
 
   # Add more helper methods to be used by all tests here...