diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-07 06:52:06 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-07 06:52:06 -0700 |
commit | 35a8920cdd4ca1b353aa7c677c21567a31f3f4a7 (patch) | |
tree | 93c548ae26cc1f084fade64c8cbebe5048451344 /actionpack/test/dispatch/session/mem_cache_store_test.rb | |
parent | c5ac6da5c213d61acc8a3552cf58a224be92ba53 (diff) | |
parent | f6f406696f01f000f1b873780648222fefe8bfce (diff) | |
download | rails-35a8920cdd4ca1b353aa7c677c21567a31f3f4a7.tar.gz rails-35a8920cdd4ca1b353aa7c677c21567a31f3f4a7.tar.bz2 rails-35a8920cdd4ca1b353aa7c677c21567a31f3f4a7.zip |
Merge pull request #7552 from guilleiguaran/dalli-session-store
Use Dalli for memcache session store
Diffstat (limited to 'actionpack/test/dispatch/session/mem_cache_store_test.rb')
-rw-r--r-- | actionpack/test/dispatch/session/mem_cache_store_test.rb | 13 |
1 files changed, 4 insertions, 9 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..e53ce4195b 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 @@ -131,11 +131,6 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest get '/get_session_id' assert_response :success end - with_autoload_path "session_autoload_test" do - get '/get_session_value' - assert_response :success - assert_equal 'foo: #<SessionAutoloadTest::Foo bar:"baz">', response.body, "should auto-load unloaded class" - end end end @@ -165,7 +160,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 |