X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..34e3e51456774127d43408b7ab65c24f41373f62:/test/test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8fcc7a94f..2787ed83f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -7,54 +7,58 @@ class ActiveSupport::TestCase
   # Load standard fixtures needed to test API methods
   def self.api_fixtures
     #print "setting up the api_fixtures"
-    fixtures :users, :changesets, :changeset_tags
+    fixtures :users, :user_roles, :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
-    set_fixture_class :current_ways => 'Way'
+    set_fixture_class :current_ways => Way
 
     fixtures :current_way_nodes, :current_way_tags
-    set_fixture_class :current_way_nodes => 'WayNode'
-    set_fixture_class :current_way_tags => 'WayTag'
+    set_fixture_class :current_way_nodes => WayNode
+    set_fixture_class :current_way_tags => WayTag
 
     fixtures :ways
-    set_fixture_class :ways => 'OldWay'
+    set_fixture_class :ways => OldWay
 
     fixtures :way_nodes, :way_tags
-    set_fixture_class :way_nodes => 'OldWayNode'
-    set_fixture_class :way_tags => 'OldWayTag'
+    set_fixture_class :way_nodes => OldWayNode
+    set_fixture_class :way_tags => OldWayTag
 
     fixtures :current_relations
-    set_fixture_class :current_relations => 'Relation'
+    set_fixture_class :current_relations => Relation
 
     fixtures :current_relation_members, :current_relation_tags
-    set_fixture_class :current_relation_members => 'RelationMember'
-    set_fixture_class :current_relation_tags => 'RelationTag'
+    set_fixture_class :current_relation_members => RelationMember
+    set_fixture_class :current_relation_tags => RelationTag
 
     fixtures :relations
-    set_fixture_class :relations => 'OldRelation'
+    set_fixture_class :relations => OldRelation
 
     fixtures :relation_members, :relation_tags
-    set_fixture_class :relation_members => 'OldRelationMember'
-    set_fixture_class :relation_tags => 'OldRelationTag'
-    
+    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'
+    set_fixture_class :gpx_files => Trace
+    set_fixture_class :gps_points => Tracepoint
+    set_fixture_class :gpx_file_tags => Tracetag
 
     fixtures :client_applications
+
+    fixtures :redactions
+
+    fixtures :notes, :note_comments
   end
 
   ##
-  # takes a block which is executed in the context of a different 
+  # 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)
@@ -82,8 +86,8 @@ class ActiveSupport::TestCase
   end
 
   ##
-  # for some reason a==b is false, but there doesn't seem to be any 
-  # difference between the nodes, so i'm checking all the attributes 
+  # for some reason a==b is false, but there doesn't seem to be any
+  # difference between the nodes, so i'm checking all the attributes
   # manually and blaming it on ActiveRecord
   def assert_nodes_are_equal(a, b)
     assert_equal a.id, b.id, "node IDs"
@@ -106,20 +110,20 @@ class ActiveSupport::TestCase
   def content(c)
     @request.env["RAW_POST_DATA"] = c.to_s
   end
-  
+
   # Used to check that the error header and the forbidden responses are given
   # when the owner of the changset has their data not marked as public
   def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
     assert_response :forbidden, msg
     assert_equal @response.headers['Error'], "You must make your edits public to upload new data", "Wrong error message"
   end
-  
+
   # Not sure this is the best response we could give
   def assert_inactive_user(msg = "an inactive user shouldn't be able to access the API")
     assert_response :unauthorized, msg
     #assert_equal @response.headers['Error'], ""
   end
-  
+
   def assert_no_missing_translations(msg="")
     assert_select "span[class=translation_missing]", false, "Missing translation #{msg}"
   end
@@ -161,6 +165,6 @@ class ActiveSupport::TestCase
     return openid_response_qs
   end
 
-  
+
   # Add more helper methods to be used by all tests here...
 end