github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get all the callback tests to work on new base

Browse Source
This commit is contained in:
Yehuda Katz + Carl Lerche
2009-06-01 15:40:11 -07:00
parent dcba6e1148
commit 196f780e30
3 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actionpack/lib/action_controller/abstract/callbacks.rb
View File

@@ -26,6 +26,12 @@ module AbstractController
end
end
def skip_filter(*names, &blk)
skip_before_filter(*names, &blk)
skip_after_filter(*names, &blk)
skip_around_filter(*names, &blk)
end
[:before, :after, :around].each do |filter|
class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
def #{filter}_filter(*names, &blk)

68
actionpack/test/controller/filters_test.rb
View File

@@ -231,24 +231,29 @@ class FilterTest < ActionController::TestCase
end
class ConditionalParentOfConditionalSkippingController < ConditionalFilterController
before_filter :conditional_in_parent, :only => [:show, :another_action]
after_filter :conditional_in_parent, :only => [:show, :another_action]
before_filter :conditional_in_parent_before, :only => [:show, :another_action]
after_filter :conditional_in_parent_after, :only => [:show, :another_action]
private
def conditional_in_parent
def conditional_in_parent_before
@ran_filter ||= []
@ran_filter << 'conditional_in_parent'
@ran_filter << 'conditional_in_parent_before'
end
def conditional_in_parent_after
@ran_filter ||= []
@ran_filter << 'conditional_in_parent_after'
end
end
class ChildOfConditionalParentController < ConditionalParentOfConditionalSkippingController
skip_before_filter :conditional_in_parent, :only => :another_action
skip_after_filter :conditional_in_parent, :only => :another_action
skip_before_filter :conditional_in_parent_before, :only => :another_action
skip_after_filter :conditional_in_parent_after, :only => :another_action
end
class AnotherChildOfConditionalParentController < ConditionalParentOfConditionalSkippingController
skip_before_filter :conditional_in_parent, :only => :show
skip_before_filter :conditional_in_parent_before, :only => :show
end
class ProcController < PrependingController
@@ -593,11 +598,22 @@ class FilterTest < ActionController::TestCase
assert_equal "before and after", assigns["execution_log"]
end
def test_prepending_and_appending_around_filter
controller = test_process(MixedFilterController)
assert_equal " before aroundfilter before procfilter before appended aroundfilter " +
" after appended aroundfilter after aroundfilter after procfilter ",
MixedFilterController.execution_log
for_tag(:old_base) do
def test_prepending_and_appending_around_filter
controller = test_process(MixedFilterController)
assert_equal " before aroundfilter before procfilter before appended aroundfilter " +
" after appended aroundfilter after aroundfilter after procfilter ",
MixedFilterController.execution_log
end
end
for_tag(:new_base) do
def test_prepending_and_appending_around_filter
controller = test_process(MixedFilterController)
assert_equal " before aroundfilter before procfilter before appended aroundfilter " +
" after appended aroundfilter after procfilter after aroundfilter ",
MixedFilterController.execution_log
end
end
def test_rendering_breaks_filtering_chain
@@ -658,18 +674,18 @@ class FilterTest < ActionController::TestCase
def test_conditional_skipping_of_filters_when_parent_filter_is_also_conditional
test_process(ChildOfConditionalParentController)
assert_equal %w( conditional_in_parent conditional_in_parent ), assigns['ran_filter']
assert_equal %w( conditional_in_parent_before conditional_in_parent_after ), assigns['ran_filter']
test_process(ChildOfConditionalParentController, 'another_action')
assert_nil assigns['ran_filter']
end
def test_condition_skipping_of_filters_when_siblings_also_have_conditions
test_process(ChildOfConditionalParentController)
assert_equal %w( conditional_in_parent conditional_in_parent ), assigns['ran_filter'], "1"
assert_equal %w( conditional_in_parent_before conditional_in_parent_after ), assigns['ran_filter']
test_process(AnotherChildOfConditionalParentController)
assert_equal nil, assigns['ran_filter']
assert_equal %w( conditional_in_parent_after ), assigns['ran_filter']
test_process(ChildOfConditionalParentController)
assert_equal %w( conditional_in_parent conditional_in_parent ), assigns['ran_filter']
assert_equal %w( conditional_in_parent_before conditional_in_parent_after ), assigns['ran_filter']
end
def test_changing_the_requirements
@@ -823,7 +839,9 @@ class ControllerWithAllTypesOfFilters < PostsController
end
class ControllerWithTwoLessFilters < ControllerWithAllTypesOfFilters
$vbf = true
skip_filter :around_again
$vbf = false
skip_filter :after
end
@@ -886,9 +904,18 @@ class YieldingAroundFiltersTest < ActionController::TestCase
end
end
def test_filter_order_with_all_filter_types
test_process(ControllerWithAllTypesOfFilters,'no_raise')
assert_equal 'before around (before yield) around_again (before yield) around_again (after yield) around (after yield) after', assigns['ran_filter'].join(' ')
for_tag(:old_base) do
def test_filter_order_with_all_filter_types
test_process(ControllerWithAllTypesOfFilters,'no_raise')
assert_equal 'before around (before yield) around_again (before yield) around_again (after yield) around (after yield) after', assigns['ran_filter'].join(' ')
end
end
for_tag(:new_base) do
def test_filter_order_with_all_filter_types
test_process(ControllerWithAllTypesOfFilters,'no_raise')
assert_equal 'before around (before yield) around_again (before yield) around_again (after yield) after around (after yield)', assigns['ran_filter'].join(' ')
end
end
def test_filter_order_with_skip_filter_method
@@ -901,7 +928,6 @@ class YieldingAroundFiltersTest < ActionController::TestCase
response = test_process(controller, 'fail_1')
assert_equal ' ', response.body
assert_equal 1, controller.instance_variable_get(:@try)
assert controller.instance_variable_get(:@before_filter_chain_aborted)
end
def test_second_filter_in_multiple_before_filter_chain_halts
@@ -909,7 +935,6 @@ class YieldingAroundFiltersTest < ActionController::TestCase
response = test_process(controller, 'fail_2')
assert_equal ' ', response.body
assert_equal 2, controller.instance_variable_get(:@try)
assert controller.instance_variable_get(:@before_filter_chain_aborted)
end
def test_last_filter_in_multiple_before_filter_chain_halts
@@ -917,7 +942,6 @@ class YieldingAroundFiltersTest < ActionController::TestCase
response = test_process(controller, 'fail_3')
assert_equal ' ', response.body
assert_equal 3, controller.instance_variable_get(:@try)
assert controller.instance_variable_get(:@before_filter_chain_aborted)
end
protected

13
activesupport/lib/active_support/new_callbacks.rb
View File

@@ -286,7 +286,14 @@ module ActiveSupport
filter
when Proc
@klass.send(:define_method, method_name, &filter)
method_name << (filter.arity == 1 ? "(self)" : "")
method_name << case filter.arity
when 1
"(self)"
when 2
" self, Proc.new "
else
""
end
when Method
@klass.send(:define_method, "#{method_name}_method") { filter }
@klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
@@ -378,7 +385,7 @@ module ActiveSupport
# The _run_save_callbacks method can optionally take a key, which
# will be used to compile an optimized callback method for each
# key. See #define_callbacks for more information.
def _define_runner(symbol, str, options)
def _define_runner(symbol, str, options)
str = <<-RUBY_EVAL
def _run_#{symbol}_callbacks(key = nil)
if key
@@ -492,7 +499,7 @@ module ActiveSupport
filter = self._#{symbol}_callbacks.find {|c| c.matches?(type, :#{symbol}, filter) }
per_key = options[:per_key] || {}
if filter
if filter && options.any?
filter.recompile!(options, per_key)
else
self._#{symbol}_callbacks.delete(filter)