Merge branch 'master' into openid

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index a83a89f2ab8f56979c3db9c2d573fbfff2d3cad2..507f9e7fce5c96a762e96c9d1b4bd1d2af81218f 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,6 +3,43 @@ require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require '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
   # Transactional fixtures accelerate your tests by wrapping each test method
   # in a transaction that's rolled back on completion.  This ensures that the