Merge remote branch 'rails/master'

1 files changed, 7 insertions, 1 deletions

diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index 61bee1b66c..6d4b8e1e40 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -152,12 +152,18 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
   end
 
   private
+
     def with_test_route_set(options = {})
       with_routing do |set|
         set.draw do |map|
           match ':action', :to => 'active_record_store_test/test'
         end
-        @app = ActiveRecord::SessionStore.new(set, options.reverse_merge(:key => '_session_id'))
+
+        @app = self.class.build_app(set) do |middleware|
+          middleware.use ActiveRecord::SessionStore, options.reverse_merge(:key => '_session_id')
+          middleware.delete "ActionDispatch::ShowExceptions"
+        end
+
         yield
       end
     end