Modify the session serializer implementation

Rename allowed options to :marshal and :json, for custom serializers
only allow the use of custom classes.

1 files changed, 3 insertions, 9 deletions

diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index b19ce905f5..6101acdc25 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -379,7 +379,7 @@ class CookiesTest < ActionController::TestCase
     assert_equal 'bar', cookies.encrypted[:foo]
   end
 
-  class ActionDispatch::Session::CustomJsonSerializer
+  class CustomJsonSerializer
     def self.load(value)
       JSON.load(value) + " and loaded"
     end
@@ -389,20 +389,14 @@ class CookiesTest < ActionController::TestCase
     end
   end
 
-  def test_encrypted_cookie_using_custom_json_serializer
-    @request.env["action_dispatch.session_serializer"] = :custom_json_serializer
-    get :set_encrypted_cookie
-    assert_equal 'bar was dumped and loaded', cookies.encrypted[:foo]
-  end
-
   def test_encrypted_cookie_using_serializer_object
-    @request.env["action_dispatch.session_serializer"] = ActionDispatch::Session::CustomJsonSerializer
+    @request.env["action_dispatch.session_serializer"] = CustomJsonSerializer
     get :set_encrypted_cookie
     assert_equal 'bar was dumped and loaded', cookies.encrypted[:foo]
   end
 
   def test_encrypted_cookie_using_json_serializer
-    @request.env["action_dispatch.session_serializer"] = :json_serializer
+    @request.env["action_dispatch.session_serializer"] = :json
     get :set_encrypted_cookie
     cookies = @controller.send :cookies
     assert_not_equal 'bar', cookies[:foo]