diff options
author | Santiago Pastorino and Carl Lerche <santiago+carl@wyeworks.com> | 2010-04-15 16:58:54 -0300 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-04-15 18:25:08 -0300 |
commit | 0ea434e2f4083368fe9657aae9ceb5c484336f14 (patch) | |
tree | 0b665d482b792621fd8c7675b053d763fa6cc47c /actionpack/test/controller/log_subscriber_test.rb | |
parent | 005c2bac46051581e5af826a183c66185022772d (diff) | |
download | rails-0ea434e2f4083368fe9657aae9ceb5c484336f14.tar.gz rails-0ea434e2f4083368fe9657aae9ceb5c484336f14.tar.bz2 rails-0ea434e2f4083368fe9657aae9ceb5c484336f14.zip |
Make perform_caching work again, with the tests passing and backward compatible
Diffstat (limited to 'actionpack/test/controller/log_subscriber_test.rb')
-rw-r--r-- | actionpack/test/controller/log_subscriber_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb index 20d3e77b6e..b11eba2f89 100644 --- a/actionpack/test/controller/log_subscriber_test.rb +++ b/actionpack/test/controller/log_subscriber_test.rb @@ -143,7 +143,7 @@ class ACLogSubscriberTest < ActionController::TestCase end def test_with_fragment_cache - ActionController::Base.perform_caching = true + @controller.config.perform_caching = true get :with_fragment_cache wait @@ -151,11 +151,11 @@ class ACLogSubscriberTest < ActionController::TestCase assert_match /Exist fragment\? views\/foo/, logs[1] assert_match /Write fragment views\/foo/, logs[2] ensure - ActionController::Base.perform_caching = true + @controller.config.perform_caching = true end def test_with_page_cache - ActionController::Base.perform_caching = true + @controller.config.perform_caching = true get :with_page_cache wait @@ -163,7 +163,7 @@ class ACLogSubscriberTest < ActionController::TestCase assert_match /Write page/, logs[1] assert_match /\/index\.html/, logs[1] ensure - ActionController::Base.perform_caching = true + @controller.config.perform_caching = true end def logs |