Merge remote branch 'rails/master'

1 files changed, 6 insertions, 1 deletions

diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 5a1dcb4dab..8858a398e0 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -114,7 +114,12 @@ class MemCacheStoreTest < ActionController::IntegrationTest
         set.draw do |map|
           match ':action', :to => ::MemCacheStoreTest::TestController
         end
-        @app = ActionDispatch::Session::MemCacheStore.new(set, :key => '_session_id')
+
+        @app = self.class.build_app(set) do |middleware|
+          middleware.use ActionDispatch::Session::MemCacheStore, :key => '_session_id'
+          middleware.delete "ActionDispatch::ShowExceptions"
+        end
+
         yield
       end
     end