Rescue hack was supposed to be removed. Some how it crept back in.

rails · May 17, 2009 · c331950 · c331950
1 parent 98eaa2c
commit c331950
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
@@ -368,9 +368,8 @@ def session
     attr_reader :template
 
     def action(name, env)
-      # HACK: For global rescue to have access to the original request and response
+      request  = ActionDispatch::Request.new(env)
-      request = env["action_controller.rescue.request"] ||= ActionDispatch::Request.new(env)
+      response = ActionDispatch::Response.new
-      response = env["action_controller.rescue.response"] ||= ActionDispatch::Response.new
       self.action_name = name && name.to_s
       process(request, response).to_a
     end

diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
@@ -132,9 +132,6 @@ def process(action, parameters = nil, session = nil, flash = nil, http_method =
       @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
       build_request_uri(action, parameters)
 
-      @request.env["action_controller.rescue.request"] = @request
-      @request.env["action_controller.rescue.response"] = @response
-
       Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
 
       env = @request.env

diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
@@ -607,7 +607,6 @@ def test_filters_with_mixed_specialization_run_in_order
   def test_dynamic_dispatch
     %w(foo bar baz).each do |action|
       request = ActionController::TestRequest.new
-      request.env["action_controller.rescue.request"] = request
       request.query_parameters[:choose] = action
       response = DynamicDispatchController.action.call(request.env).last
       assert_equal action, response.body

diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
@@ -104,15 +104,13 @@ def test_helper_attr
 
   def call_controller(klass, action)
     request  = ActionController::TestRequest.new
-    request.env["action_controller.rescue.request"] = request
     klass.action(action).call(request.env)    
   end
 
   def test_helper_for_nested_controller
     assert_equal 'hello: Iz guuut!', 
       call_controller(Fun::GamesController, "render_hello_world").last.body
     # request  = ActionController::TestRequest.new
-    # request.env["action_controller.rescue.request"] = request
     # 
     # resp = Fun::GamesController.action(:render_hello_world).call(request.env)
     # assert_equal 'hello: Iz guuut!', resp.last.body
@@ -217,7 +215,6 @@ def index
 
   def call_controller(klass, action)
     request  = ActionController::TestRequest.new
-    request.env["action_controller.rescue.request"] = request
     klass.action(action).call(request.env)    
   end