use a request object in the session middleware

This commit allows us to use one request object rather than allocating
multiple request objects to deal with the session.

2 files changed, 24 insertions, 22 deletions

diff --git a/actionpack/test/dispatch/request/session_test.rb b/actionpack/test/dispatch/request/session_test.rb
index 8bcc07dd04..410e3194e2 100644
--- a/actionpack/test/dispatch/request/session_test.rb
+++ b/actionpack/test/dispatch/request/session_test.rb
@@ -4,40 +4,42 @@ require 'action_dispatch/middleware/session/abstract_store'
 module ActionDispatch
   class Request
     class SessionTest < ActiveSupport::TestCase
+      attr_reader :req
+
+      def setup
+        @req = ActionDispatch::Request.new({})
+      end
+
       def test_create_adds_itself_to_env
-        env = {}
-        s = Session.create(store, env, {})
-        assert_equal s, env[Rack::RACK_SESSION]
+        s = Session.create(store, req, {})
+        assert_equal s, req.env[Rack::RACK_SESSION]
       end
 
       def test_to_hash
-        env = {}
-        s = Session.create(store, env, {})
+        s = Session.create(store, req, {})
         s['foo'] = 'bar'
         assert_equal 'bar', s['foo']
         assert_equal({'foo' => 'bar'}, s.to_hash)
       end
 
       def test_create_merges_old
-        env = {}
-        s = Session.create(store, env, {})
+        s = Session.create(store, req, {})
         s['foo'] = 'bar'
 
-        s1 = Session.create(store, env, {})
+        s1 = Session.create(store, req, {})
         assert_not_equal s, s1
         assert_equal 'bar', s1['foo']
       end
 
       def test_find
-        env = {}
-        assert_nil Session.find(env)
+        assert_nil Session.find(req)
 
-        s = Session.create(store, env, {})
-        assert_equal s, Session.find(env)
+        s = Session.create(store, req, {})
+        assert_equal s, Session.find(req)
       end
 
       def test_destroy
-        s = Session.create(store, {}, {})
+        s = Session.create(store, req, {})
         s['rails'] = 'ftw'
 
         s.destroy
@@ -46,21 +48,21 @@ module ActionDispatch
       end
 
       def test_keys
-        s = Session.create(store, {}, {})
+        s = Session.create(store, req, {})
         s['rails'] = 'ftw'
         s['adequate'] = 'awesome'
         assert_equal %w[rails adequate], s.keys
       end
 
       def test_values
-        s = Session.create(store, {}, {})
+        s = Session.create(store, req, {})
         s['rails'] = 'ftw'
         s['adequate'] = 'awesome'
         assert_equal %w[ftw awesome], s.values
       end
 
       def test_clear
-        s = Session.create(store, {}, {})
+        s = Session.create(store, req, {})
         s['rails'] = 'ftw'
         s['adequate'] = 'awesome'
 
@@ -69,7 +71,7 @@ module ActionDispatch
       end
 
       def test_update
-        s = Session.create(store, {}, {})
+        s = Session.create(store, req, {})
         s['rails'] = 'ftw'
 
         s.update(:rails => 'awesome')
@@ -79,7 +81,7 @@ module ActionDispatch
       end
 
       def test_delete
-        s = Session.create(store, {}, {})
+        s = Session.create(store, req, {})
         s['rails'] = 'ftw'
 
         s.delete('rails')
@@ -88,7 +90,7 @@ module ActionDispatch
       end
 
       def test_fetch
-        session = Session.create(store, {}, {})
+        session = Session.create(store, req, {})
 
         session['one'] = '1'
         assert_equal '1', session.fetch(:one)
diff --git a/actionpack/test/dispatch/session/abstract_store_test.rb b/actionpack/test/dispatch/session/abstract_store_test.rb
index fe1a7b4f86..1c35144e6f 100644
--- a/actionpack/test/dispatch/session/abstract_store_test.rb
+++ b/actionpack/test/dispatch/session/abstract_store_test.rb
@@ -27,7 +27,7 @@ module ActionDispatch
         as.call(env)
 
         assert @env
-        assert Request::Session.find @env
+        assert Request::Session.find ActionDispatch::Request.new @env
       end
 
       def test_new_session_object_is_merged_with_old
@@ -36,11 +36,11 @@ module ActionDispatch
         as.call(env)
 
         assert @env
-        session = Request::Session.find @env
+        session = Request::Session.find ActionDispatch::Request.new @env
         session['foo'] = 'bar'
 
         as.call(@env)
-        session1 = Request::Session.find @env
+        session1 = Request::Session.find ActionDispatch::Request.new @env
 
         assert_not_equal session, session1
         assert_equal session.to_hash, session1.to_hash