Fixed tests for Django 1.10

Author: silvanocerza

oauth2_provider/admin.py

@@ -6,6 +6,7 @@
 class RawIDAdmin(admin.ModelAdmin):
     raw_id_fields = ('user',)
 
+
 Application = get_application_model()
 
 admin.site.register(Application, RawIDAdmin)

oauth2_provider/middleware.py

@@ -3,7 +3,7 @@
 
 # bastb Django 1.10 has updated Middleware. This code imports the Mixin required to get old-style
 # middleware working again
-# More? 
+# More?
 #  https://docs.djangoproject.com/en/1.10/topics/http/middleware/#upgrading-pre-django-1-10-style-middleware
 try:
     from django.utils.deprecation import MiddlewareMixin

oauth2_provider/tests/settings.py

@@ -1,6 +1,3 @@
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
 ADMINS = ()
 
 MANAGERS = ADMINS
@@ -40,10 +37,25 @@
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = "1234567890evonove"
 
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'debug': True,
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+                'django.template.context_processors.debug',
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.media',
+                'django.template.context_processors.static',
+                'django.template.context_processors.tz',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
@@ -55,8 +67,6 @@
 
 ROOT_URLCONF = 'oauth2_provider.tests.urls'
 
-TEMPLATE_DIRS = ()
-
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',

oauth2_provider/tests/test_models.py

@@ -122,7 +122,14 @@ def test_related_objects(self):
         # Django internals caches the related objects.
         if django.VERSION < (1, 8):
             del UserModel._meta._related_objects_cache
-        related_object_names = [ro.name for ro in UserModel._meta.get_all_related_objects()]
+        if django.VERSION < (1, 10):
+            related_object_names = [ro.name for ro in UserModel._meta.get_all_related_objects()]
+        else:
+            related_object_names = [
+                f.name for f in UserModel._meta.get_fields()
+                if (f.one_to_many or f.one_to_one)
+                and f.auto_created and not f.concrete
+            ]
         self.assertNotIn('oauth2_provider:application', related_object_names)
         self.assertIn('tests%stestapplication' % (':' if django.VERSION < (1, 8) else '_'),
                       related_object_names)

oauth2_provider/tests/test_rest_framework.py

@@ -5,6 +5,7 @@
 from django.contrib.auth import get_user_model
 from django.http import HttpResponse
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.utils import timezone
 
 from .test_utils import TestCaseUtils
@@ -71,9 +72,8 @@ class BaseTest(TestCaseUtils, TestCase):
     pass
 
 
+@override_settings(ROOT_URLCONF=__name__)
 class TestOAuth2Authentication(BaseTest):
-    urls = 'oauth2_provider.tests.test_rest_framework'
-
     def setUp(self):
         oauth2_settings._SCOPES = ['read', 'write', 'scope1', 'scope2', 'resource1']