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

Ensure controller filters are executed before stuff starts to happen.

Browse source
This commit is contained in:
José Valim 2010-03-13 21:28:34 +01:00
parent ee4c89627a
commit 4ba334c0f4
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@ module ActionController
class Base < Metal
abstract!
include AbstractController::Callbacks
include AbstractController::Layouts
include AbstractController::Translation
@ -23,6 +22,7 @@ module ActionController
# Rails 2.x compatibility
include ActionController::Compatibility
include ActionController::ImplicitRender
include ActionController::Cookies
include ActionController::Flash
@ -36,8 +36,12 @@ module ActionController
# Add instrumentations hooks at the bottom, to ensure they instrument
# all the methods properly.
include ActionController::Instrumentation
include ImplicitRender
# Before callbacks should also be executed the earliest as possible, so
# also include them at the bottom.
include AbstractController::Callbacks
# The same with rescue, append it at the end to wrap as much as possible.
include ActionController::Rescue
def self.inherited(klass)

2
actionpack/lib/action_controller/metal/rendering.rb
View file

@ -6,7 +6,7 @@ module ActionController
include AbstractController::Rendering
# Before processing, set the request formats in current controller formats.
def process(*) #:nodoc:
def process_action(*) #:nodoc:
self.formats = request.formats.map { |x| x.to_sym }
super
end

14
actionpack/test/controller/render_test.rb
View file

@ -617,6 +617,15 @@ class TestController < ActionController::Base
raise
end
before_filter :only => :render_with_filters do
request.format = :xml
end
# Ensure that the before filter is executed *before* self.formats is set.
def render_with_filters
render :action => :formatted_xml_erb
end
private
def determine_layout
@ -1034,6 +1043,11 @@ class RenderTest < ActionController::TestCase
assert_equal "<html>Hello world!</html>", @response.body
end
def test_render_with_filters
get :render_with_filters
assert_equal "<test>passed formatted xml erb</test>", @response.body
end
# :ported:
def test_double_render
assert_raise(ActionController::DoubleRenderError) { get :double_render }