diff options
| author | Angelo capilleri <capilleri@yahoo.com> | 2013-05-13 10:38:34 +0200 |
|---|---|---|
| committer | Angelo capilleri <capilleri@yahoo.com> | 2013-05-13 16:10:53 +0200 |
| commit | 8da819eef5f11cc016ffa9ad747421ee50be32fa (patch) | |
| tree | 7f563b64ff1208d844ff142246bc0cd993584176 /actionpack/test | |
| parent | b44f086cf10532ca65d192047f713ffbd1cdcbdb (diff) | |
| download | rails-8da819eef5f11cc016ffa9ad747421ee50be32fa.tar.gz rails-8da819eef5f11cc016ffa9ad747421ee50be32fa.tar.bz2 rails-8da819eef5f11cc016ffa9ad747421ee50be32fa.zip | |
add test for skip_before_filter with condition
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/filters_test.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb index 3b79161ad3..b5f22066af 100644 --- a/actionpack/test/controller/filters_test.rb +++ b/actionpack/test/controller/filters_test.rb @@ -213,6 +213,14 @@ class FilterTest < ActionController::TestCase before_filter :clean_up_tmp, :if => Proc.new { |c| false } end + class ConditionalOptionsSkipFilter < ConditionalFilterController + before_filter :ensure_login + before_filter :clean_up_tmp + + skip_before_filter :ensure_login, if: -> { false } + skip_before_filter :clean_up_tmp, if: -> { true } + end + class PrependingController < TestController prepend_before_filter :wonderful_life # skip_before_filter :fire_flash @@ -593,6 +601,11 @@ class FilterTest < ActionController::TestCase assert_equal %w( ensure_login ), assigns["ran_filter"] end + def test_running_conditional_skip_options + test_process(ConditionalOptionsSkipFilter) + assert_equal %w( ensure_login ), assigns["ran_filter"] + end + def test_running_collection_condition_filters test_process(ConditionalCollectionFilterController) assert_equal %w( ensure_login ), assigns["ran_filter"] |