Altered a functional test on way_tags.

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 22cc0e15c36bf880e219170652cd76e4bdb7a14b..63567cc9b3ef44cab9133b26aa9d9b43f936c307 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -27,12 +27,15 @@ 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, :current_node_tags
+    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
@@ -55,5 +58,19 @@ class Test::Unit::TestCase
     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...
 end