Memoize request accessors on the Rack env so other request objects have access to the same cache [#1668 state:resolved]

2 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index c93d3152b8..02bb2ee890 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -391,8 +391,8 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   def test_parameters
-    @request.instance_eval { @request_parameters = { "foo" => 1 } }
-    @request.instance_eval { @query_parameters = { "bar" => 2 } }
+    @request.stubs(:request_parameters).returns({ "foo" => 1 })
+    @request.stubs(:query_parameters).returns({ "bar" => 2 })
 
     assert_equal({"foo" => 1, "bar" => 2}, @request.parameters)
     assert_equal({"foo" => 1}, @request.request_parameters)
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index 8728c9fca3..9f6b45f065 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -383,8 +383,8 @@ class RescueControllerTest < ActionController::TestCase
 
   def test_rescue_dispatcher_exceptions
     env = @request.env
-    env["actioncontroller.rescue.request"] = @request
-    env["actioncontroller.rescue.response"] = @response
+    env["action_controller.rescue.request"] = @request
+    env["action_controller.rescue.response"] = @response
 
     RescueController.call_with_exception(env, ActionController::RoutingError.new("Route not found"))
     assert_equal "no way", @response.body