Clean up session integration tests so they don't reference AC::Dispatcher

1 files changed, 3 insertions, 12 deletions

diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 1588918be7..d7129da187 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -32,8 +32,6 @@ class MemCacheStoreTest < ActionController::IntegrationTest
   end
 
   begin
-    App = ActionDispatch::Session::MemCacheStore.new(ActionController::Dispatcher.new, :key => '_session_id')
-
     def test_setting_and_getting_session_value
       with_test_route_set do
         get '/set_session_value'
@@ -107,20 +105,13 @@ class MemCacheStoreTest < ActionController::IntegrationTest
   end
 
   private
-    def reset_app!
-      app = ActionDispatch::Session::MemCacheStore.new(
-        ActionController::Dispatcher.new, :key => '_session_id')
-      @integration_session = open_session(app)
-    end
-
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.with_options :controller => "mem_cache_store_test/test" do |c|
-            c.connect "/:action"
-          end
+          map.connect "/:action", :controller => "mem_cache_store_test/test"
         end
-        reset_app!
+        app = ActionDispatch::Session::MemCacheStore.new(set, :key => '_session_id')
+        @integration_session = open_session(app)
         yield
       end
     end