Merge remote-tracking branch 'upstream/master' into vagrant

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7d2aa405fcfde7962477d58da27c86b1acba9117..4e95bb7a8dbc892c0f812879813a2922115bcc89 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,48 +3,11 @@ 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'
@@ -88,6 +51,10 @@ class ActiveSupport::TestCase
     set_fixture_class :gpx_file_tags => 'Tracetag'
 
     fixtures :client_applications
+    
+    fixtures :redactions
+
+    fixtures :notes, :note_comments
   end
 
   ##