aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2012-08-27 09:46:35 +0530
committerArun Agrawal <arunagw@gmail.com>2012-08-27 09:46:35 +0530
commit834a5a9c7eb9ea43af067b8b2b3af0249e4fd461 (patch)
tree61399ce8e3453b5091bd85b4331b842583602c00 /actionpack
parentea84b0c6183949750f0801db50d22e58d62ec024 (diff)
downloadrails-834a5a9c7eb9ea43af067b8b2b3af0249e4fd461.tar.gz
rails-834a5a9c7eb9ea43af067b8b2b3af0249e4fd461.tar.bz2
rails-834a5a9c7eb9ea43af067b8b2b3af0249e4fd461.zip
Let's run action pack tests with Dalli
There is no memcache gem left in repo.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/dispatch/session/mem_cache_store_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 03234612ab..7e9e41c29a 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -34,9 +34,9 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
end
begin
- require 'memcache'
- memcache = MemCache.new('localhost:11211')
- memcache.set('ping', '')
+ require 'dalli'
+ ss = Dalli::Client.new('localhost:11211').stats
+ raise Dalli::DalliError unless ss['localhost:11211']
def test_setting_and_getting_session_value
with_test_route_set do
@@ -165,7 +165,7 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
assert_not_equal session_id, cookies['_session_id']
end
end
- rescue LoadError, RuntimeError
+ rescue LoadError, RuntimeError, Dalli::DalliError
$stderr.puts "Skipping MemCacheStoreTest tests. Start memcached and try again."
end