kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

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

Browse source
This commit is contained in:
Joshua Peek 2009-05-17 11:09:14 -05:00
parent 98eaa2c683
commit c3319504f0
4 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
actionpack/lib/action_controller/base/base.rb
View file

@ -368,9 +368,8 @@ module ActionController #:nodoc:
attr_reader :template attr_reader :template
def action(name, env) 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 self.action_name = name && name.to_s
process(request, response).to_a process(request, response).to_a
end end

3
actionpack/lib/action_controller/testing/process.rb
View file

@ -132,9 +132,6 @@ module ActionController #:nodoc:
@request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
build_request_uri(action, parameters) 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 Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
env = @request.env env = @request.env

1
actionpack/test/controller/filters_test.rb
View file

@ -607,7 +607,6 @@ class FilterTest < Test::Unit::TestCase
def test_dynamic_dispatch def test_dynamic_dispatch
%w(foo bar baz).each do |action| %w(foo bar baz).each do |action|
request = ActionController::TestRequest.new request = ActionController::TestRequest.new
request.env["action_controller.rescue.request"] = request
request.query_parameters[:choose] = action request.query_parameters[:choose] = action
response = DynamicDispatchController.action.call(request.env).last response = DynamicDispatchController.action.call(request.env).last
assert_equal action, response.body assert_equal action, response.body

3
actionpack/test/controller/helper_test.rb
View file

@ -104,7 +104,6 @@ class HelperTest < Test::Unit::TestCase
def call_controller(klass, action) def call_controller(klass, action)
request = ActionController::TestRequest.new request = ActionController::TestRequest.new
request.env["action_controller.rescue.request"] = request
klass.action(action).call(request.env) klass.action(action).call(request.env)
end end
@ -112,7 +111,6 @@ class HelperTest < Test::Unit::TestCase
assert_equal 'hello: Iz guuut!', assert_equal 'hello: Iz guuut!',
call_controller(Fun::GamesController, "render_hello_world").last.body call_controller(Fun::GamesController, "render_hello_world").last.body
# request = ActionController::TestRequest.new # request = ActionController::TestRequest.new
# request.env["action_controller.rescue.request"] = request
# #
# resp = Fun::GamesController.action(:render_hello_world).call(request.env) # resp = Fun::GamesController.action(:render_hello_world).call(request.env)
# assert_equal 'hello: Iz guuut!', resp.last.body # assert_equal 'hello: Iz guuut!', resp.last.body
@ -217,7 +215,6 @@ class IsolatedHelpersTest < Test::Unit::TestCase
def call_controller(klass, action) def call_controller(klass, action)
request = ActionController::TestRequest.new request = ActionController::TestRequest.new
request.env["action_controller.rescue.request"] = request
klass.action(action).call(request.env) klass.action(action).call(request.env)
end end