* Mutating the ``request.cookies`` property now reflects the mutations intofeature.cookie-bug-for-bug

  the ``HTTP_COOKIES`` environ header.

2 files changed, 196 insertions, 2 deletions

diff --git a/tests/test_cookies.py b/tests/test_cookies.py
index 923978d..6a4c163 100644
--- a/tests/test_cookies.py
+++ b/tests/test_cookies.py
@@ -3,6 +3,9 @@ from datetime import timedelta
 from webob import cookies
 from webob.compat import text_
 from nose.tools import eq_
+import unittest
+from webob.compat import native_
+from webob.compat import PY3
 
 def test_cookie_empty():
     c = cookies.Cookie() # empty cookie
@@ -140,3 +143,183 @@ def test_morsel_repr():
     result = repr(v)
     eq_(result, "<Morsel: a='b'>")
 
+class TestRequestCookies(unittest.TestCase):
+    def _makeOne(self, environ):
+        from webob.cookies import RequestCookies
+        return RequestCookies(environ)
+
+    def test_get_no_cache_key_in_environ_no_http_cookie_header(self):
+        environ = {}
+        inst = self._makeOne(environ)
+        self.assertEqual(inst.get('a'), None)
+        parsed = environ['webob._parsed_cookies']
+        self.assertEqual(parsed, ({}, ''))
+
+    def test_get_no_cache_key_in_environ_has_http_cookie_header(self):
+        header ='a=1; b=2'
+        environ = {'HTTP_COOKIE':header}
+        inst = self._makeOne(environ)
+        self.assertEqual(inst.get('a'), '1')
+        parsed = environ['webob._parsed_cookies'][0]
+        self.assertEqual(parsed['a'], '1')
+        self.assertEqual(parsed['b'], '2')
+        self.assertEqual(environ['HTTP_COOKIE'], header) # no change
+
+    def test_get_cache_key_in_environ_no_http_cookie_header(self):
+        environ = {'webob._parsed_cookies':({}, '')}
+        inst = self._makeOne(environ)
+        self.assertEqual(inst.get('a'), None)
+        parsed = environ['webob._parsed_cookies']
+        self.assertEqual(parsed, ({}, ''))
+
+    def test_get_cache_key_in_environ_has_http_cookie_header(self):
+        header ='a=1; b=2'
+        environ = {'HTTP_COOKIE':header, 'webob._parsed_cookies':({}, '')}
+        inst = self._makeOne(environ)
+        self.assertEqual(inst.get('a'), '1')
+        parsed = environ['webob._parsed_cookies'][0]
+        self.assertEqual(parsed['a'], '1')
+        self.assertEqual(parsed['b'], '2')
+        self.assertEqual(environ['HTTP_COOKIE'], header) # no change
+
+    def test___setitem__name_not_string_type(self):
+        inst = self._makeOne({})
+        self.assertRaises(TypeError, inst.__setitem__, None, 1)
+        
+    def test___setitem__name_not_encodeable_to_ascii(self):
+        name = native_(b'La Pe\xc3\xb1a', 'utf-8')
+        inst = self._makeOne({})
+        self.assertRaises(TypeError, inst.__setitem__, name, 'abc')
+        
+    def test___setitem__name_not_rfc2109_valid(self):
+        name = '$a'
+        inst = self._makeOne({})
+        self.assertRaises(TypeError, inst.__setitem__, name, 'abc')
+        
+    def test___setitem__value_not_string_type(self):
+        inst = self._makeOne({})
+        self.assertRaises(ValueError, inst.__setitem__, 'a', None)
+
+    def test___setitem__value_not_utf_8_decodeable(self):
+        value = text_(b'La Pe\xc3\xb1a', 'utf-8')
+        value = value.encode('utf-16')
+        inst = self._makeOne({})
+        self.assertRaises(ValueError, inst.__setitem__, 'a', value)
+
+    def test__setitem__success_no_existing_headers(self):
+        value = native_(b'La Pe\xc3\xb1a', 'utf-8')
+        environ = {}
+        inst = self._makeOne(environ)
+        inst['a'] = value
+        self.assertEqual(environ['HTTP_COOKIE'], 'a="La Pe\\303\\261a"')
+        
+    def test__setitem__success_append(self):
+        value = native_(b'La Pe\xc3\xb1a', 'utf-8')
+        environ = {'HTTP_COOKIE':'a=1; b=2'}
+        inst = self._makeOne(environ)
+        inst['c'] = value
+        self.assertEqual(
+            environ['HTTP_COOKIE'], 'a=1; b=2; c="La Pe\\303\\261a"')
+
+    def test__setitem__success_replace(self):
+        environ = {'HTTP_COOKIE':'a=1; b="La Pe\\303\\261a"; c=3'}
+        inst = self._makeOne(environ)
+        inst['b'] = 'abc'
+        self.assertEqual(environ['HTTP_COOKIE'], 'a=1; b=abc; c=3')
+        inst['c'] = '4'
+        self.assertEqual(environ['HTTP_COOKIE'], 'a=1; b=abc; c=4')
+
+    def test__delitem__fail_no_http_cookie(self):
+        environ = {}
+        inst = self._makeOne(environ)
+        self.assertRaises(KeyError, inst.__delitem__, 'a')
+        self.assertEqual(environ, {})
+
+    def test__delitem__fail_with_http_cookie(self):
+        environ = {'HTTP_COOKIE':''}
+        inst = self._makeOne(environ)
+        self.assertRaises(KeyError, inst.__delitem__, 'a')
+        self.assertEqual(environ, {'HTTP_COOKIE':''})
+
+    def test__delitem__success(self):
+        environ = {'HTTP_COOKIE':'a=1'}
+        inst = self._makeOne(environ)
+        del inst['a']
+        self.assertEqual(environ['HTTP_COOKIE'], '')
+        self.assertEqual(inst._cache, {})
+
+    def test_keys(self):
+        environ = {'HTTP_COOKIE':'a=1; b="La Pe\\303\\261a"; c=3'}
+        inst = self._makeOne(environ)
+        self.assertEqual(sorted(list(inst.keys())), ['a', 'b', 'c'])
+        
+    def test_values(self):
+        val = text_(b'La Pe\xc3\xb1a', 'utf-8')
+        environ = {'HTTP_COOKIE':'a=1; b="La Pe\\303\\261a"; c=3'}
+        inst = self._makeOne(environ)
+        self.assertEqual(sorted(list(inst.values())), ['1', '3', val])
+
+    def test_items(self):
+        val = text_(b'La Pe\xc3\xb1a', 'utf-8')
+        environ = {'HTTP_COOKIE':'a=1; b="La Pe\\303\\261a"; c=3'}
+        inst = self._makeOne(environ)
+        self.assertEqual(sorted(list(inst.items())),
+                         [('a', '1'), ('b', val), ('c', '3')])
+
+    if not PY3:
+        def test_iterkeys(self):
+            environ = {'HTTP_COOKIE':'a=1; b="La Pe\\303\\261a"; c=3'}
+            inst = self._makeOne(environ)
+            self.assertEqual(sorted(list(inst.iterkeys())), ['a', 'b', 'c'])
+
+        def test_itervalues(self):
+            val = text_(b'La Pe\xc3\xb1a', 'utf-8')
+            environ = {'HTTP_COOKIE':'a=1; b="La Pe\\303\\261a"; c=3'}
+            inst = self._makeOne(environ)
+            self.assertEqual(sorted(list(inst.itervalues())), ['1', '3', val])
+
+        def test_iteritems(self):
+            val = text_(b'La Pe\xc3\xb1a', 'utf-8')
+            environ = {'HTTP_COOKIE':'a=1; b="La Pe\\303\\261a"; c=3'}
+            inst = self._makeOne(environ)
+            self.assertEqual(sorted(list(inst.iteritems())),
+                             [('a', '1'), ('b', val), ('c', '3')])
+
+    def test___contains__(self):
+        environ = {'HTTP_COOKIE':'a=1'}
+        inst = self._makeOne(environ)
+        self.assertTrue('a' in inst)
+        self.assertFalse('b' in inst)
+        
+    def test___iter__(self):
+        environ = {'HTTP_COOKIE':'a=1; b=2; c=3'}
+        inst = self._makeOne(environ)
+        self.assertEqual(sorted(list(iter(inst))), ['a', 'b', 'c'])
+
+    def test___len__(self):
+        environ = {'HTTP_COOKIE':'a=1; b=2; c=3'}
+        inst = self._makeOne(environ)
+        self.assertEqual(len(inst), 3)
+        del inst['a']
+        self.assertEqual(len(inst), 2)
+
+    def test_clear(self):
+        environ = {'HTTP_COOKIE':'a=1; b=2; c=3'}
+        inst = self._makeOne(environ)
+        inst.clear()
+        self.assertEqual(environ['HTTP_COOKIE'], '')
+        self.assertEqual(inst.get('a'), None)
+
+    def test___repr__(self):
+        environ = {'HTTP_COOKIE':'a=1; b=2; c=3'}
+        inst = self._makeOne(environ)
+        r = repr(inst)
+        self.assertTrue(r.startswith(
+            '<RequestCookies (dict-like) with values '))
+        self.assertTrue(r.endswith('>'))
+        
+        
+        
+        
+
+        
diff --git a/tests/test_request.py b/tests/test_request.py
index 9120425..70956db 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -1,3 +1,4 @@
+import collections
 import unittest, warnings
 from webob.request import Request
 from webob.request import BaseRequest
@@ -790,6 +791,16 @@ class BaseRequestTests(unittest.TestCase):
         req = BaseRequest(environ)
         self.assertEqual(req.cookies, {'a': 'b'})
 
+    def test_set_cookies(self):
+        environ = {
+            'HTTP_COOKIE': 'a=b',
+        }
+        req = BaseRequest(environ)
+        req.cookies = {'a':'1', 'b': '2'}
+        self.assertEqual(req.cookies, {'a': '1', 'b':'2'})
+        rcookies = [x.strip() for x in environ['HTTP_COOKIE'].split(';')]
+        self.assertEqual(sorted(rcookies), ['a=1', 'b=2'])
+
     def test_is_xhr_no_header(self):
         req = BaseRequest({})
         self.assert_(not req.is_xhr)
@@ -1531,7 +1542,7 @@ class RequestTests_functional(unittest.TestCase):
                 'datetime.datetime(1994, 10, 29, 19, 43, 31, tzinfo=UTC)',
             "user_agent: 'Mozilla",
             'is_xhr: True',
-            "cookies is {",
+            "cookies is <RequestCookies",
             'var1',
             'value1',
             'params is NestedMultiDict',
@@ -2237,7 +2248,7 @@ class RequestTests_functional(unittest.TestCase):
 
         # Cookies
         req.headers['Cookie'] = 'test=value'
-        self.assert_(isinstance(req.cookies, dict))
+        self.assert_(isinstance(req.cookies, collections.MutableMapping))
         self.assertEqual(list(req.cookies.items()), [('test', 'value')])
         req.charset = None
         self.assertEqual(req.cookies, {'test': 'value'})