aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/filters_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-04 08:35:35 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-04 08:35:35 -0700
commit8b6d2ef2f562c34ebc2ef547b0a18c31f5820569 (patch)
treeb1397a8374b465ea2f300e776de126bb88386bcc /actionpack/test/controller/filters_test.rb
parentd3ee8756c8b09b8524a9599926b02ededd27319c (diff)
parentbcc4537f2a0d37fc02d67e9564fa5c9c5555b3d5 (diff)
downloadrails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.gz
rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.bz2
rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/filters_test.rb')
-rw-r--r--actionpack/test/controller/filters_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 5876f55420..5fd3eb0446 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -169,6 +169,7 @@ class FilterTest < Test::Unit::TestCase
end
def public
+ render :text => 'ok'
end
end
@@ -177,6 +178,10 @@ class FilterTest < Test::Unit::TestCase
before_filter :find_record
before_filter :ensure_login
+ def index
+ render :text => 'ok'
+ end
+
private
def find_record
@ran_filter ||= []