From 0637b4d02114b26a0addfe3d11a5afa0cba80573 Mon Sep 17 00:00:00 2001
From: Drew Hubl <drew.hubl@gmail.com>
Date: Wed, 31 May 2017 10:32:10 -0600
Subject: [PATCH] Add a few more tests to increase coverage

---
 tos/apps.py                  | 21 ++---------
 tos/signal_handlers.py       | 19 ++++++++++
 tos/tests/test_middleware.py | 71 +++++++++++++++++++++++++++++++++++-
 3 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 tos/signal_handlers.py

diff --git a/tos/apps.py b/tos/apps.py
index 98d7491..b797327 100644
--- a/tos/apps.py
+++ b/tos/apps.py
@@ -1,9 +1,8 @@
 from django.apps import AppConfig
 from django.conf import settings
-from django.core.cache import caches
 from django.db.models.signals import pre_save
-from django.dispatch import receiver
 
+from .signal_handlers import invalidate_cached_agreements
 
 MIDDLEWARES = getattr(settings, 'MIDDLEWARE_CLASSES', [])
 
@@ -14,23 +13,11 @@ class TOSConfig(AppConfig):
 
     def ready(self):
         if 'tos.middleware.UserAgreementMiddleware' in MIDDLEWARES:
-            # Force the user to create a separate cache
-            cache = caches[getattr(settings, 'TOS_CACHE_NAME', 'default')]
-
             TermsOfService = self.get_model('TermsOfService')
 
-            @receiver(pre_save, sender=TermsOfService, dispatch_uid='invalidate_cached_agreements')
-            def invalidate_cached_agreements(TermsOfService, instance, **kwargs):
-                if kwargs.get('raw', False):
-                    return
-
-                # Set the key version to 0 if it doesn't exist and leave it
-                # alone if it does
-                cache.add('django:tos:key_version', 0)
-
-                # This key will be used to version the rest of the TOS keys
-                # Incrementing it will effectively invalidate all previous keys
-                cache.incr('django:tos:key_version')
+            pre_save.connect(invalidate_cached_agreements,
+                             sender=TermsOfService,
+                             dispatch_uid='invalidate_cached_agreements')
 
             # Create the TOS key version immediately
             invalidate_cached_agreements(TermsOfService, None)
diff --git a/tos/signal_handlers.py b/tos/signal_handlers.py
new file mode 100644
index 0000000..63f770f
--- /dev/null
+++ b/tos/signal_handlers.py
@@ -0,0 +1,19 @@
+from django.conf import settings
+
+from .compat import get_cache
+
+# Force the user to create a separate cache
+cache = get_cache(getattr(settings, 'TOS_CACHE_NAME', 'default'))
+
+
+def invalidate_cached_agreements(TermsOfService, instance, **kwargs):
+    if kwargs.get('raw', False):
+        return
+
+    # Set the key version to 0 if it doesn't exist and leave it
+    # alone if it does
+    cache.add('django:tos:key_version', 0)
+
+    # This key will be used to version the rest of the TOS keys
+    # Incrementing it will effectively invalidate all previous keys
+    cache.incr('django:tos:key_version')
diff --git a/tos/tests/test_middleware.py b/tos/tests/test_middleware.py
index 83fbbe0..fb4c601 100644
--- a/tos/tests/test_middleware.py
+++ b/tos/tests/test_middleware.py
@@ -4,8 +4,10 @@ from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
 
-from tos.compat import get_runtime_user_model
+from tos.compat import get_cache, get_runtime_user_model
+from tos.middleware import UserAgreementMiddleware
 from tos.models import TermsOfService, UserAgreement
+from tos.signal_handlers import invalidate_cached_agreements
 
 
 @override_settings(
@@ -82,3 +84,70 @@ class TestMiddleware(TestCase):
         # Confirm redirects back to the index page
         self.assertEqual(response.status_code, 302)
         self.assertEqual(response.url.replace('http://testserver', ''), str(reverse('index')))
+
+
+@override_settings(
+    MIDDLEWARE_CLASSES=settings.MIDDLEWARE_CLASSES + [
+        'tos.middleware.UserAgreementMiddleware',
+    ]
+)
+class BumpCoverage(TestCase):
+
+    def setUp(self):
+        # User that has agreed to TOS
+        self.user1 = get_runtime_user_model().objects.create_user('user1', 'user1@example.com', 'user1pass')
+
+        self.tos1 = TermsOfService.objects.create(
+            content="first edition of the terms of service",
+            active=True
+        )
+        self.tos2 = TermsOfService.objects.create(
+            content="second edition of the terms of service",
+            active=False
+        )
+        self.login_url = getattr(settings, 'LOGIN_URL', '/login/')
+
+        UserAgreement.objects.create(
+            terms_of_service=self.tos1,
+            user=self.user1
+        )
+
+    def test_ajax_request(self):
+        class Request(object):
+            method = 'GET'
+
+            def is_ajax(self):
+                return True
+
+        mw = UserAgreementMiddleware()
+
+        response = mw.process_request(Request())
+
+        self.assertIsNone(response)
+
+    def test_skip_for_user(self):
+        cache = get_cache(getattr(settings, 'TOS_CACHE_NAME', 'default'))
+
+        key_version = cache.get('django:tos:key_version')
+
+        cache.set('django:tos:skip_tos_check:{0}'.format(str(self.user1.id)), True, version=key_version)
+
+        self.client.login(username='user1', password='user1pass')
+        response = self.client.get(reverse('index'))
+
+        self.assertEqual(response.status_code, 200)
+
+    def test_invalidate_cached_agreements(self):
+        cache = get_cache(getattr(settings, 'TOS_CACHE_NAME', 'default'))
+
+        invalidate_cached_agreements(TermsOfService, {})
+
+        key_version = cache.get('django:tos:key_version')
+
+        invalidate_cached_agreements(TermsOfService, {})
+
+        self.assertEqual(cache.get('django:tos:key_version'), key_version+1)
+
+        invalidate_cached_agreements(TermsOfService, {}, raw=True)
+
+        self.assertEqual(cache.get('django:tos:key_version'), key_version+1)