Merge pull request #31 from zerebubuth/routing-ui-tweaks-2

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7d2aa405fcfde7962477d58da27c86b1acba9117..9464d66239f94f6f23de11b10f8c0ce1b87bec7e 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,91 +3,58 @@ require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 load 'composite_primary_keys/fixtures.rb'
 
-# This monkey patch is to make tests where a rack module alters
-# the response work with rails 2 - it can be dropped when we move
-# to rails 3.
-module ActionController
-  module Integration
-    class Session
-      def process_with_capture(method, path, parameters = nil, headers = nil)
-        status = process_without_capture(method, path, parameters, headers)
-        @controller = ActionController::Base.last_controller
-        @request = @controller.request
-        @response.session = @controller.response.session
-        @response.template = @controller.response.template
-        @response.redirected_to = @response.location
-        status
-      end
-
-      alias_method_chain :process, :capture
-    end
-
-    module ControllerCapture
-      module ClassMethods
-        mattr_accessor :last_controller
-
-        def clear_last_instantiation!
-          self.last_controller = nil
-        end
-
-        def new_with_capture(*args)
-          controller = new_without_capture(*args)
-          self.last_controller ||= controller
-          controller
-        end
-      end
-    end
-  end
-end
-
 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
 
   ##