diff options
| author | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
| commit | 197904341f2b2f21d69c653cede3aec124e86720 (patch) | |
| tree | 83f1234e238016126860a929594db22e1862d783 /actionpack/test/controller/filters_test.rb | |
| parent | 76d2c455c0607b4cd5f238cadef8f933a18567fb (diff) | |
| parent | b3a0aed028835ce4551c4a76742744a40a71b0be (diff) | |
| download | rails-197904341f2b2f21d69c653cede3aec124e86720.tar.gz rails-197904341f2b2f21d69c653cede3aec124e86720.tar.bz2 rails-197904341f2b2f21d69c653cede3aec124e86720.zip | |
Merge branch 'master' into docrails
Diffstat (limited to 'actionpack/test/controller/filters_test.rb')
| -rw-r--r-- | actionpack/test/controller/filters_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb index 004e1369d3..ea740f7233 100644 --- a/actionpack/test/controller/filters_test.rb +++ b/actionpack/test/controller/filters_test.rb @@ -651,9 +651,9 @@ class FilterTest < ActionController::TestCase assert_equal %w( ensure_login find_user ), assigns["ran_filter"] test_process(ConditionalSkippingController, "login") - assert_nil @controller.template.controller.instance_variable_get("@ran_after_filter") + assert_nil @controller.instance_variable_get("@ran_after_filter") test_process(ConditionalSkippingController, "change_password") - assert_equal %w( clean_up ), @controller.template.controller.instance_variable_get("@ran_after_filter") + assert_equal %w( clean_up ), @controller.instance_variable_get("@ran_after_filter") end def test_conditional_skipping_of_filters_when_parent_filter_is_also_conditional |