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

1 files changed, 6 insertions, 21 deletions

diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index 19d9c955a5..71719c0f97 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -33,7 +33,6 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
 
   def setup
     ActiveRecord::SessionStore.session_class.create_table!
-    reset_app!
   end
 
   def teardown
@@ -132,9 +131,7 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
   end
 
   def test_allows_session_fixation
-    with_test_route_set do
-      reset_with_fixation!
-
+    with_test_route_set(:cookie_only => false) do
       get '/set_session_value'
       assert_response :success
       assert cookies['_session_id']
@@ -145,8 +142,6 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
       session_id = cookies['_session_id']
       assert session_id
 
-      reset_with_fixation!
-
       get '/set_session_value', :_session_id => session_id, :foo => "baz"
       assert_response :success
       assert_equal session_id, cookies['_session_id']
@@ -159,24 +154,14 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
   end
 
   private
-    def reset_app!
-      app = ActiveRecord::SessionStore.new(ActionController::Dispatcher.new, :key => '_session_id')
-      @integration_session = open_session(app)
-    end
-
-    def reset_with_fixation!
-      app = ActiveRecord::SessionStore.new(ActionController::Dispatcher.new, :key => '_session_id', :cookie_only => false)
-      @integration_session = open_session(app)
-    end
-
-    def with_test_route_set
+    def with_test_route_set(options = {})
       with_routing do |set|
         set.draw do |map|
-          map.with_options :controller => "active_record_store_test/test" do |c|
-            c.connect "/:action"
-          end
+          map.connect "/:action", :controller => "active_record_store_test/test"
         end
-        reset_app!
+        options = {:key => '_session_id'}.merge(options)
+        app = ActiveRecord::SessionStore.new(set, options)
+        @integration_session = open_session(app)
         yield
       end
     end