2 files changed, 104 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/request/session_test.rb b/actionpack/test/dispatch/request/session_test.rb
new file mode 100644
index 0000000000..4d24456ba6
--- /dev/null
+++ b/actionpack/test/dispatch/request/session_test.rb
@@ -0,0 +1,48 @@
+require 'abstract_unit'
+require 'action_dispatch/middleware/session/abstract_store'
+
+module ActionDispatch
+  class Request
+    class SessionTest < ActiveSupport::TestCase
+      def test_create_adds_itself_to_env
+        env = {}
+        s = Session.create(store, env, {})
+        assert_equal s, env[Rack::Session::Abstract::ENV_SESSION_KEY]
+      end
+
+      def test_to_hash
+        env = {}
+        s = Session.create(store, env, {})
+        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['foo'] = 'bar'
+
+        s1 = Session.create(store, env, {})
+        refute_equal s, s1
+        assert_equal 'bar', s1['foo']
+      end
+
+      def test_find
+        env = {}
+        assert_nil Session.find(env)
+
+        s = Session.create(store, env, {})
+        assert_equal s, Session.find(env)
+      end
+
+      private
+      def store
+        Class.new {
+          def load_session(env); [1, {}]; end
+          def session_exists?(env); true; end
+        }.new
+      end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/session/abstract_store_test.rb b/actionpack/test/dispatch/session/abstract_store_test.rb
new file mode 100644
index 0000000000..8daf3d3f5e
--- /dev/null
+++ b/actionpack/test/dispatch/session/abstract_store_test.rb
@@ -0,0 +1,56 @@
+require 'abstract_unit'
+require 'action_dispatch/middleware/session/abstract_store'
+
+module ActionDispatch
+  module Session
+    class AbstractStoreTest < ActiveSupport::TestCase
+      class MemoryStore < AbstractStore
+        def initialize(app)
+          @sessions = {}
+          super
+        end
+
+        def get_session(env, sid)
+          sid ||= 1
+          session = @sessions[sid] ||= {}
+          [sid, session]
+        end
+
+        def set_session(env, sid, session, options)
+          @sessions[sid] = session
+        end
+      end
+
+      def test_session_is_set
+        env = {}
+        as = MemoryStore.new app
+        as.call(env)
+
+        assert @env
+        assert Request::Session.find @env
+      end
+
+      def test_new_session_object_is_merged_with_old
+        env = {}
+        as = MemoryStore.new app
+        as.call(env)
+
+        assert @env
+        session = Request::Session.find @env
+        session['foo'] = 'bar'
+
+        as.call(@env)
+        session1 = Request::Session.find @env
+
+        refute_equal session, session1
+        assert_equal session.to_hash, session1.to_hash
+      end
+
+      private
+      def app(&block)
+        @env = nil
+        lambda { |env| @env = env }
+      end
+    end
+  end
+end