aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-06-12 19:52:33 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-06-12 19:52:33 -0500
commit6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354 (patch)
tree3285bde79403e99cdf773f5a3d8467a59b0ed648 /actionpack/test/controller
parenta3caf28da3a22c1326d3d98dcf71483a8edaa55a (diff)
downloadrails-6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354.tar.gz
rails-6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354.tar.bz2
rails-6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354.zip
Revert "Lazy load cache and session stores"
This reverts commit 19895f087c338d8385dff9d272d30fb87cb10330.
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/caching_test.rb1
-rw-r--r--actionpack/test/controller/session/mem_cache_store_test.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 89e12ddae3..14cf0a86a1 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -1,6 +1,5 @@
require 'fileutils'
require 'abstract_unit'
-require "active_support/cache/memory_store"
CACHE_DIR = 'test_cache'
# Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
diff --git a/actionpack/test/controller/session/mem_cache_store_test.rb b/actionpack/test/controller/session/mem_cache_store_test.rb
index 079a870ece..a7d48431f8 100644
--- a/actionpack/test/controller/session/mem_cache_store_test.rb
+++ b/actionpack/test/controller/session/mem_cache_store_test.rb
@@ -1,7 +1,7 @@
require 'abstract_unit'
require 'action_controller/cgi_process'
require 'action_controller/cgi_ext'
-require 'action_controller/session/mem_cache_store'
+
class CGI::Session
def cache