3 files changed, 31 insertions, 13 deletions
diff --git a/actionpack/test/dispatch/session/cache_store_test.rb b/actionpack/test/dispatch/session/cache_store_test.rb
index b8479e8836..9f810cad01 100644
--- a/actionpack/test/dispatch/session/cache_store_test.rb
+++ b/actionpack/test/dispatch/session/cache_store_test.rb
@@ -148,16 +148,15 @@ class CacheStoreTest < ActionDispatch::IntegrationTest
 
   def test_prevents_session_fixation
     with_test_route_set do
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body
-      session_id = cookies['_session_id']
+      assert_equal nil, @cache.read('_session_id:0xhax')
 
-      reset!
+      cookies['_session_id'] = '0xhax'
+      get '/set_session_value'
 
-      get '/set_session_value', :_session_id => session_id
       assert_response :success
-      assert_not_equal session_id, cookies['_session_id']
+      assert_not_equal '0xhax', cookies['_session_id']
+      assert_equal nil, @cache.read('_session_id:0xhax')
+      assert_equal({'foo' => 'bar'}, @cache.read("_session_id:#{cookies['_session_id']}"))
     end
   end
 
@@ -169,8 +168,8 @@ class CacheStoreTest < ActionDispatch::IntegrationTest
         end
 
         @app = self.class.build_app(set) do |middleware|
-          cache = ActiveSupport::Cache::MemoryStore.new
-          middleware.use ActionDispatch::Session::CacheStore, :key => '_session_id', :cache => cache
+          @cache = ActiveSupport::Cache::MemoryStore.new
+          middleware.use ActionDispatch::Session::CacheStore, :key => '_session_id', :cache => @cache
           middleware.delete "ActionDispatch::ShowExceptions"
         end
 
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index e99ff46edf..c5cd24d06e 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -86,7 +86,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
       cookies[SessionKey] = SignedBar
       get '/persistent_session_id'
       assert_response :success
-      assert_equal response.body.size, 32
+      assert_equal 32, response.body.size
       session_id = response.body
 
       get '/get_session_id'
@@ -247,7 +247,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
       cookies[SessionKey] = SignedBar
       get '/persistent_session_id'
       assert_response :success
-      assert_equal response.body.size, 32
+      assert_equal 32, response.body.size
       session_id = response.body
       get '/persistent_session_id'
       assert_equal session_id, response.body
@@ -263,7 +263,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
 
       get "/get_session_id"
       sid = response.body
-      assert_equal sid.size, 36
+      assert_equal 36, sid.size
 
       get "/change_session_id"
       assert_not_equal sid, response.body
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index e53ce4195b..f7a06cfed4 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'securerandom'
 
 # You need to start a memcached server inorder to run these tests
 class MemCacheStoreTest < ActionDispatch::IntegrationTest
@@ -48,6 +49,8 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         assert_response :success
         assert_equal 'foo: "bar"', response.body
       end
+    rescue Dalli::RingError => ex
+      skip ex.message, ex.backtrace
     end
 
     def test_getting_nil_session_value
@@ -56,6 +59,8 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         assert_response :success
         assert_equal 'foo: nil', response.body
       end
+    rescue Dalli::RingError => ex
+      skip ex.message, ex.backtrace
     end
 
     def test_getting_session_value_after_session_reset
@@ -75,6 +80,8 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         assert_response :success
         assert_equal 'foo: nil', response.body, "data for this session should have been obliterated from memcached"
       end
+    rescue Dalli::RingError => ex
+      skip ex.message, ex.backtrace
     end
 
     def test_getting_from_nonexistent_session
@@ -84,6 +91,8 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         assert_equal 'foo: nil', response.body
         assert_nil cookies['_session_id'], "should only create session on write, not read"
       end
+    rescue Dalli::RingError => ex
+      skip ex.message, ex.backtrace
     end
 
     def test_setting_session_value_after_session_reset
@@ -105,6 +114,8 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         assert_response :success
         assert_not_equal session_id, response.body
       end
+    rescue Dalli::RingError => ex
+      skip ex.message, ex.backtrace
     end
 
     def test_getting_session_id
@@ -118,6 +129,8 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         assert_response :success
         assert_equal session_id, response.body, "should be able to read session id without accessing the session hash"
       end
+    rescue Dalli::RingError => ex
+      skip ex.message, ex.backtrace
     end
 
     def test_deserializes_unloaded_class
@@ -132,6 +145,8 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
           assert_response :success
         end
       end
+    rescue Dalli::RingError => ex
+      skip ex.message, ex.backtrace
     end
 
     def test_doesnt_write_session_cookie_if_session_id_is_already_exists
@@ -144,6 +159,8 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         assert_response :success
         assert_equal nil, headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
       end
+    rescue Dalli::RingError => ex
+      skip ex.message, ex.backtrace
     end
 
     def test_prevents_session_fixation
@@ -159,6 +176,8 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         assert_response :success
         assert_not_equal session_id, cookies['_session_id']
       end
+    rescue Dalli::RingError => ex
+      skip ex.message, ex.backtrace
     end
   rescue LoadError, RuntimeError, Dalli::DalliError
     $stderr.puts "Skipping MemCacheStoreTest tests. Start memcached and try again."
@@ -172,7 +191,7 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
         end
 
         @app = self.class.build_app(set) do |middleware|
-          middleware.use ActionDispatch::Session::MemCacheStore, :key => '_session_id'
+          middleware.use ActionDispatch::Session::MemCacheStore, :key => '_session_id', :namespace => "mem_cache_store_test:#{SecureRandom.hex(10)}"
           middleware.delete "ActionDispatch::ShowExceptions"
         end