Add even more cookie tests, fixed InvalidMessage exception scope

fxposter · Nov 22, 2012 · ba7d38a · ba7d38a
1 parent 52a4346
commit ba7d38a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -395,7 +395,7 @@ def [](name)
           @encryptor.decrypt_and_verify(encrypted_message)
         end
       rescue ActiveSupport::MessageVerifier::InvalidSignature,
-             ActiveSupport::MessageVerifier::InvalidMessage
+             ActiveSupport::MessageEncryptor::InvalidMessage
         nil
       end
 

diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
@@ -382,6 +382,8 @@ def test_delete_and_set_signed_permanent_encrypted_cookie
     assert_nil @controller.send(:cookies)[:user_name]
     assert_nil @controller.send(:cookies).signed.permanent.encrypted[:user_name]
     assert_equal @controller.send(:cookies).signed.permanent.encrypted[:user_surname], 'Smith'
+    assert_not_equal @controller.send(:cookies)[:user_surname], 'Smith'
+    assert_not_equal @controller.send(:cookies).encrypted[:user_surname], 'Smith'
   end
 
   def test_delete_and_set_cookie