Added test cases for cookie code. This will test all the cookie setting code, and also adds test for draft for include_text and full_draft cookie checking. Commit ready for merge.

 - Legacy-Id: 9319

Author: kivinen

ietf/cookies/tests.py

@@ -0,0 +1,296 @@
+from django.core.urlresolvers import reverse as urlreverse
+from ietf.utils.test_data import make_test_data
+from ietf.utils.test_utils import TestCase
+from Cookie import SimpleCookie
+
+class CookieTests(TestCase):
+    def test_settings_defaults(self):
+        make_test_data()
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
+        
+    def test_settings_defaults_from_cookies(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
+        
+    def test_settings_values_from_cookies_garbage(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'foo', 'new_enough' : 'foo', 'expires_soon' : 'foo'})
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
+
+    def test_settings_values_from_cookies_random(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'zappa', 'new_enough' : '365', 'expires_soon' : '5'})
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertNotRegexpMatches(r.content, r'ietf-highlight-y.*new_enough')
+        self.assertNotRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon')
+
+    def test_settings_values_from_cookies_1(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '90', 'expires_soon' : 7})
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*90 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*7 days')
+
+    def test_settings_values_from_cookies_2(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '60', 'expires_soon' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*60 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
+       
+    def test_settings_values_from_cookies_3(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '30', 'expires_soon' : 21})
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*30 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*21 days')
+
+    def test_settings_values_from_cookies_4(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '21', 'expires_soon' : 30})
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*21 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*30 days')
+
+    def test_settings_values_from_cookies_5(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '14', 'expires_soon' : 60})
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*60 days')
+
+    def test_settings_values_from_cookies_6(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '7', 'expires_soon' : 90})
+        r = self.client.get(urlreverse("ietf.cookies.views.settings"))
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual([], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*7 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*90 days')
+
+    def test_full_draft(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.full_draft"))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['full_draft'].value, 'off')
+        self.assertListEqual(['full_draft'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
+
+    def test_full_draft_on(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.full_draft", kwargs=dict(enabled="on")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['full_draft'].value, 'on')
+        self.assertListEqual(['full_draft'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+
+    def test_full_draft_off(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.full_draft", kwargs=dict(enabled="off")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['full_draft'].value, 'off')
+        self.assertListEqual(['full_draft'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+
+    def test_full_draft_foo(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.full_draft", kwargs=dict(enabled="foo")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['full_draft'].value, 'off')
+        self.assertListEqual(['full_draft'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+
+    def test_new_enough(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.new_enough"))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['new_enough'].value, '14')
+        self.assertListEqual(['new_enough'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
+
+    def test_new_enough_7(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '14', 'expires_soon' : 21})
+        r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="7")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['new_enough'].value, '7')
+        self.assertListEqual(['new_enough'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*7 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*21 days')
+
+    def test_new_enough_14(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '7', 'expires_soon' : 99})
+        r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="14")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['new_enough'].value, '14')
+        self.assertListEqual(['new_enough'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
+        self.assertNotRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon')
+
+    def test_new_enough_21(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '14', 'expires_soon' : 90})
+        r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="21")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['new_enough'].value, '21')
+        self.assertListEqual(['new_enough'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*21 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*90 days')
+
+    def test_new_enough_30(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 7})
+        r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="30")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['new_enough'].value, '30')
+        self.assertListEqual(['new_enough'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*30 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*7 days')
+
+    def test_new_enough_60(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="60")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['new_enough'].value, '60')
+        self.assertListEqual(['new_enough'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*60 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
+
+    def test_new_enough_90(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '22', 'expires_soon' : 60})
+        r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="90")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['new_enough'].value, '90')
+        self.assertListEqual(['new_enough'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*90 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*60 days')
+
+    def test_expires_soon(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'expires_soon' : '14', 'new_enough' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.expires_soon"))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['expires_soon'].value, '14')
+        self.assertListEqual(['expires_soon'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
+
+    def test_expires_soon_7(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'on', 'expires_soon' : '14', 'new_enough' : 21})
+        r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="7")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['expires_soon'].value, '7')
+        self.assertListEqual(['expires_soon'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*7 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*21 days')
+
+    def test_expires_soon_14(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'on', 'expires_soon' : '7', 'new_enough' : 99})
+        r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="14")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['expires_soon'].value, '14')
+        self.assertListEqual(['expires_soon'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
+        self.assertNotRegexpMatches(r.content, r'ietf-highlight-y.*new_enough')
+
+    def test_expires_soon_21(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'on', 'expires_soon' : '14', 'new_enough' : 90})
+        r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="21")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['expires_soon'].value, '21')
+        self.assertListEqual(['expires_soon'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*21 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*90 days')
+
+    def test_expires_soon_30(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'expires_soon' : '14', 'new_enough' : 7})
+        r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="30")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['expires_soon'].value, '30')
+        self.assertListEqual(['expires_soon'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*30 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*7 days')
+
+    def test_expires_soon_60(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'expires_soon' : '14', 'new_enough' : 14})
+        r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="60")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['expires_soon'].value, '60')
+        self.assertListEqual(['expires_soon'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*60 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
+
+    def test_expires_soon_90(self):
+        make_test_data()
+        self.client.cookies = SimpleCookie({'full_draft': 'off', 'expires_soon' : '22', 'new_enough' : 60})
+        r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="90")))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.cookies['expires_soon'].value, '90')
+        self.assertListEqual(['expires_soon'], r.cookies.keys())
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*90 days')
+        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*60 days')

ietf/cookies/views.py

@@ -5,18 +5,20 @@
 
 def settings(request, new_enough = -1, expires_soon = -1, full_draft = ""):
     if new_enough < 0:
-        if "new_enough" in request.COOKIES:
+        if "new_enough" in request.COOKIES and request.COOKIES["new_enough"].isdigit():
             new_enough = int(request.COOKIES["new_enough"])
         else:
             new_enough = 14
     if expires_soon < 0:
-        if "expires_soon" in request.COOKIES:
+        if "expires_soon" in request.COOKIES and request.COOKIES["expires_soon"].isdigit():
             expires_soon = int(request.COOKIES["expires_soon"])
         else:
             expires_soon = 14
     if full_draft == "":
         if "full_draft" in request.COOKIES:
             full_draft = request.COOKIES["full_draft"]
+            if full_draft != 'on' and full_draft != 'off':
+                full_draft = "off"
         else:
             full_draft = "off"
     return render("cookies/settings.html",