aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-11-04 19:42:22 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-11-04 19:42:22 +0000
commita6106e4ec645c0dc799ce7666d2a28b46ea6126d (patch)
tree8f63e47a58dca4cbe329064784b376ca0f654435 /actionpack/test/controller
parenta5a82d978bd4a46ce73462a0adcb031aa5919ce4 (diff)
downloadrails-a6106e4ec645c0dc799ce7666d2a28b46ea6126d.tar.gz
rails-a6106e4ec645c0dc799ce7666d2a28b46ea6126d.tar.bz2
rails-a6106e4ec645c0dc799ce7666d2a28b46ea6126d.zip
Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies [DHH] Added short-hand to assert_tag so assert_tag :tag => "span" can be written as assert_tag "span" [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2873 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/filters_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 1bd625f084..da6dee1540 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -99,6 +99,7 @@ class FilterTest < Test::Unit::TestCase
class PrependingController < TestController
prepend_before_filter :wonderful_life
+ skip_before_filter :fire_flash
private
def wonderful_life
@@ -225,7 +226,7 @@ class FilterTest < Test::Unit::TestCase
end
def test_prepending_filter
- assert_equal [ :wonderful_life, :fire_flash, :ensure_login ], PrependingController.before_filters
+ assert_equal [ :wonderful_life, :ensure_login ], PrependingController.before_filters
end
def test_running_filters