diff options
| author | lifo <lifo@null.lan> | 2009-04-17 14:06:26 +0100 |
|---|---|---|
| committer | lifo <lifo@null.lan> | 2009-04-17 14:06:26 +0100 |
| commit | 20401783cf26f903d7020cb7136b1e78e60e71ea (patch) | |
| tree | 5bb029802ade6dda33e051adf74915dc0a8d1fe5 /actionpack/test/controller/caching_test.rb | |
| parent | f99e9f627b6e4ab7fe72bc759426312ec0c7a2cd (diff) | |
| parent | abb899c54e8777428b7a607774370ba29a5573bd (diff) | |
| download | rails-20401783cf26f903d7020cb7136b1e78e60e71ea.tar.gz rails-20401783cf26f903d7020cb7136b1e78e60e71ea.tar.bz2 rails-20401783cf26f903d7020cb7136b1e78e60e71ea.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base.rb
railties/guides/source/caching_with_rails.textile
Diffstat (limited to 'actionpack/test/controller/caching_test.rb')
| -rw-r--r-- | actionpack/test/controller/caching_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index 86dafd9221..b61a58dd09 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -44,6 +44,7 @@ end class PageCachingTest < ActionController::TestCase def setup + super ActionController::Base.perform_caching = true ActionController::Routing::Routes.draw do |map| @@ -222,6 +223,7 @@ end class ActionCacheTest < ActionController::TestCase def setup + super reset! FileUtils.mkdir_p(FILE_STORE_PATH) @path_class = ActionController::Caching::Actions::ActionCachePath @@ -483,6 +485,7 @@ end class FragmentCachingTest < ActionController::TestCase def setup + super ActionController::Base.perform_caching = true @store = ActiveSupport::Cache::MemoryStore.new ActionController::Base.cache_store = @store @@ -615,6 +618,7 @@ end class FunctionalFragmentCachingTest < ActionController::TestCase def setup + super ActionController::Base.perform_caching = true @store = ActiveSupport::Cache::MemoryStore.new ActionController::Base.cache_store = @store |