Update tests to use Django 1.9 URLs

moderation/models.py

@@ -21,6 +21,7 @@
 from .fields import SerializedObjectField
 from .managers import ModeratedObjectManager
 from .signals import post_moderation, pre_moderation
+from .utils import django_19
 
 import datetime
 
@@ -145,7 +146,10 @@ def get_absolute_url(self):
         return None
 
     def get_admin_moderate_url(self):
-        return "/admin/moderation/moderatedobject/%s/" % self.pk
+        if django_19():
+            return "/admin/moderation/moderatedobject/%s/change/" % self.pk
+        else:
+            return "/admin/moderation/moderatedobject/%s/" % self.pk
 
     @property
     def moderator(self):

moderation/utils.py

@@ -18,6 +18,12 @@ def clear_builtins(attrs):
     return new_attrs
 
 
+def django_19():
+    if StrictVersion(django.get_version()) >= StrictVersion('1.9.0'):
+        return True
+    return False
+
+
 def django_17():
     if StrictVersion(django.get_version()) >= StrictVersion('1.7.0'):
         return True

tests/tests/unit/testadmin.py

@@ -1,20 +1,24 @@
 from __future__ import unicode_literals
+
 import mock
+
 from django.contrib.admin.sites import site
 from django.contrib.auth.models import User, Permission
 from django.test.testcases import TestCase
 
-from tests.utils.request_factory import RequestFactory
 from moderation.admin import ModerationAdmin, approve_objects, reject_objects,\
     ModeratedObjectAdmin, set_objects_as_pending
-from tests.utils.testcases import WebTestCase
+from moderation.constants import (MODERATION_STATUS_APPROVED,
+                                  MODERATION_STATUS_REJECTED,
+                                  MODERATION_STATUS_PENDING)
 from moderation.moderator import GenericModerator
-from moderation.models import ModeratedObject,\
-    MODERATION_STATUS_APPROVED, MODERATION_STATUS_REJECTED,\
-    MODERATION_STATUS_PENDING
+from moderation.models import ModeratedObject
+from moderation.utils import django_19
 from tests.models import UserProfile, Book, \
     ModelWithSlugField, ModelWithSlugField2, SuperUserProfile
 from tests.utils import setup_moderation, teardown_moderation
+from tests.utils.request_factory import RequestFactory
+from tests.utils.testcases import WebTestCase
 
 
 class ModeratedObjectAdminTestCase(TestCase):
@@ -67,7 +71,11 @@ def tearDown(self):
     def test_set_changed_by_property(self):
         """even_when_auto_approve_for_staff_is_false"""
         self.assertEquals(self.book.moderated_object.changed_by, None)
-        page = self.get('/admin/tests/book/1/')
+        if django_19():
+            url = '/admin/tests/book/1/change/'
+        else:
+            url = '/admin/tests/book/1/'
+        page = self.get(url)
         form = page.form
         form['title'] = "Book modified"
         page = form.submit()