From: Tom Hughes <tom@compton.nu>
Date: Tue, 13 Sep 2011 23:20:29 +0000 (+0100)
Subject: Remove monkey patch added for rails 2
X-Git-Tag: live~6078
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4cf73c81ba0d4e85f9d16a07fef362217107b5fa?hp=bded277e115af38cebbcc19432a449969ae57e9e

Remove monkey patch added for rails 2
---

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7d2aa405f..8fcc7a94f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,43 +3,6 @@ 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