Use contrib.auth user model in tests

Author: synasius

oauth2_provider/tests/test_application_views.py

@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
+from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
-from ..compat import get_user_model
 from ..models import get_application_model
 
 
@@ -12,8 +12,8 @@
 
 class BaseTest(TestCase):
     def setUp(self):
-        self.foo_user = get_user_model().objects.create_user("foo_user", "test@user.com", "123456")
-        self.bar_user = get_user_model().objects.create_user("bar_user", "dev@user.com", "123456")
+        self.foo_user = User.objects.create_user("foo_user", "test@user.com", "123456")
+        self.bar_user = User.objects.create_user("bar_user", "dev@user.com", "123456")
 
     def tearDown(self):
         self.foo_user.delete()

oauth2_provider/tests/test_authorization_code.py

@@ -3,10 +3,11 @@
 import json
 
 from django.test import TestCase, RequestFactory
+from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.utils import timezone
 
-from ..compat import urlparse, parse_qs, urlencode, get_user_model
+from ..compat import urlparse, parse_qs, urlencode
 from ..models import get_application_model, Grant
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
@@ -26,8 +27,8 @@ def get(self, request, *args, **kwargs):
 class BaseTest(TestCaseUtils, TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = get_user_model().objects.create_user("test_user", "test@user.com", "123456")
-        self.dev_user = get_user_model().objects.create_user("dev_user", "dev@user.com", "123456")
+        self.test_user = User.objects.create_user("test_user", "test@user.com", "123456")
+        self.dev_user = User.objects.create_user("dev_user", "dev@user.com", "123456")
 
         self.application = Application(
             name="Test Application",

oauth2_provider/tests/test_client_credential.py

@@ -2,13 +2,13 @@
 
 import json
 
+from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.test import TestCase, RequestFactory
 from django.views.generic import View
 
 from oauthlib.oauth2 import BackendApplicationServer
 
-from ..compat import get_user_model
 from ..models import get_application_model
 from ..oauth2_validators import OAuth2Validator
 from ..settings import oauth2_settings
@@ -29,8 +29,8 @@ def get(self, request, *args, **kwargs):
 class BaseTest(TestCaseUtils, TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = get_user_model().objects.create_user("test_user", "test@user.com", "123456")
-        self.dev_user = get_user_model().objects.create_user("dev_user", "dev@user.com", "123456")
+        self.test_user = User.objects.create_user("test_user", "test@user.com", "123456")
+        self.dev_user = User.objects.create_user("dev_user", "dev@user.com", "123456")
 
         self.application = Application(
             name="test_client_credentials_app",

oauth2_provider/tests/test_decorators.py

@@ -2,11 +2,10 @@
 from datetime import timedelta
 
 from django.test import TestCase, RequestFactory
-from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
 from django.utils import timezone
 
 from ..decorators import protected_resource, rw_protected_resource
-from ..compat import get_user_model
 from ..settings import oauth2_settings
 from ..models import get_application_model, AccessToken
 from .test_utils import TestCaseUtils
@@ -21,7 +20,7 @@ def setUpClass(cls):
         cls.request_factory = RequestFactory()
 
     def setUp(self):
-        self.user = get_user_model().objects.create_user("test_user", "test@user.com", "123456")
+        self.user = User.objects.create_user("test_user", "test@user.com", "123456")
         self.application = Application.objects.create(
             name="test_client_credentials_app",
             user=self.user,

oauth2_provider/tests/test_implicit.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
 from django.test import TestCase, RequestFactory
+from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 
-from ..compat import urlparse, parse_qs, urlencode, get_user_model
+from ..compat import urlparse, parse_qs, urlencode
 from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
@@ -21,8 +22,8 @@ def get(self, request, *args, **kwargs):
 class BaseTest(TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = get_user_model().objects.create_user("test_user", "test@user.com", "123456")
-        self.dev_user = get_user_model().objects.create_user("dev_user", "dev@user.com", "123456")
+        self.test_user = User.objects.create_user("test_user", "test@user.com", "123456")
+        self.dev_user = User.objects.create_user("dev_user", "dev@user.com", "123456")
 
         self.application = Application(
             name="Test Implicit Application",

oauth2_provider/tests/test_models.py

@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
 from django.test import TestCase
+from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 
-from ..compat import get_user_model
 from ..models import AccessToken, get_application_model
 
 
@@ -12,7 +12,7 @@
 
 class TestModels(TestCase):
     def setUp(self):
-        self.user = get_user_model().objects.create_user("test_user", "test@user.com", "123456")
+        self.user = User.objects.create_user("test_user", "test@user.com", "123456")
 
     def test_allow_scopes(self):
         self.client.login(username="test_user", password="123456")

oauth2_provider/tests/test_password.py

@@ -3,9 +3,9 @@
 import json
 
 from django.test import TestCase, RequestFactory
+from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 
-from ..compat import get_user_model
 from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
@@ -25,8 +25,8 @@ def get(self, request, *args, **kwargs):
 class BaseTest(TestCaseUtils, TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = get_user_model().objects.create_user("test_user", "test@user.com", "123456")
-        self.dev_user = get_user_model().objects.create_user("dev_user", "dev@user.com", "123456")
+        self.test_user = User.objects.create_user("test_user", "test@user.com", "123456")
+        self.dev_user = User.objects.create_user("dev_user", "dev@user.com", "123456")
 
         self.application = Application(
             name="Test Password Application",

oauth2_provider/tests/test_rest_framework.py

@@ -1,13 +1,13 @@
 from datetime import timedelta
 
+from django.contrib.auth.models import User
 from django.conf.urls import patterns, url, include
 from django.http import HttpResponse
 from django.test import TestCase
 from django.utils import timezone, unittest
 
 
 from .test_utils import TestCaseUtils
-from ..compat import get_user_model
 from ..models import AccessToken, get_application_model
 from ..settings import oauth2_settings
 
@@ -65,8 +65,8 @@ class TestOAuth2Authentication(BaseTest):
     def setUp(self):
         oauth2_settings._SCOPES = ['read', 'write', 'scope1', 'scope2']
 
-        self.test_user = get_user_model().objects.create_user("test_user", "test@user.com", "123456")
-        self.dev_user = get_user_model().objects.create_user("dev_user", "dev@user.com", "123456")
+        self.test_user = User.objects.create_user("test_user", "test@user.com", "123456")
+        self.dev_user = User.objects.create_user("dev_user", "dev@user.com", "123456")
 
         self.application = Application.objects.create(
             name="Test Application",

oauth2_provider/tests/test_scopes.py

@@ -3,10 +3,11 @@
 import json
 
 from django.test import TestCase, RequestFactory
+from django.contrib.auth.models import User
 from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import reverse
 
-from ..compat import urlparse, parse_qs, get_user_model
+from ..compat import urlparse, parse_qs
 from ..models import get_application_model, Grant, AccessToken
 from ..settings import oauth2_settings
 from ..views import ScopedProtectedResourceView, ReadWriteScopedResourceView
@@ -43,8 +44,8 @@ def post(self, request, *args, **kwargs):
 class BaseTest(TestCaseUtils, TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = get_user_model().objects.create_user("test_user", "test@user.com", "123456")
-        self.dev_user = get_user_model().objects.create_user("dev_user", "dev@user.com", "123456")
+        self.test_user = User.objects.create_user("test_user", "test@user.com", "123456")
+        self.dev_user = User.objects.create_user("dev_user", "dev@user.com", "123456")
 
         self.application = Application(
             name="Test Application",