Merged 14009:14059 from trunk.

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 713bbf6484af8220e3b55f12d2fa19855b34cb64..88a6fbe4ac9ad139f549f5bb19c6d42bee7d083b 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -27,35 +27,41 @@ class Test::Unit::TestCase
 
   # Load standard fixtures needed to test API methods
   def self.api_fixtures
-    fixtures :users, :changesets
+    #print "setting up the api_fixtures"
+    fixtures :users, :changesets, :changeset_tags
 
     fixtures :current_nodes, :nodes
-    set_fixture_class :current_nodes => :Node
-    set_fixture_class :nodes => :OldNode
+    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
+    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
-    set_fixture_class :current_way_tags => :WayTag
+    set_fixture_class :current_ways => Way
+    set_fixture_class :current_way_nodes => WayNode
+    set_fixture_class :current_way_tags => WayTag
 
     fixtures :ways, :way_nodes, :way_tags
-    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
+    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
+    set_fixture_class :relations => OldRelation
+    set_fixture_class :relation_members => OldRelationMember
+    set_fixture_class :relation_tags => OldRelationTag
+    
+    fixtures :gpx_files, :gps_points, :gpx_file_tags
+    set_fixture_class :gpx_files => Trace
+    set_fixture_class :gps_points => Tracepoint
+    set_fixture_class :gpx_file_tags => Tracetag
   end
 
   ##
@@ -100,5 +106,13 @@ class Test::Unit::TestCase
     assert_equal a.tags, b.tags, "tags on node #{a.id}"
   end
 
+  def basic_authorization(user, pass)
+    @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
+  end
+
+  def content(c)
+    @request.env["RAW_POST_DATA"] = c.to_s
+  end
+
   # Add more helper methods to be used by all tests here...
 end