retrieve user model with get_user_model() fix #51

Author: Massimiliano Pippi

oauth2_provider/tests/test_application_views.py

@@ -1,19 +1,19 @@
 from __future__ import unicode_literals
 
-from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
 from ..models import get_application_model
-
+from ..compat import get_user_model
 
 Application = get_application_model()
+UserModel = get_user_model()
 
 
 class BaseTest(TestCase):
     def setUp(self):
-        self.foo_user = User.objects.create_user("foo_user", "[email protected]", "123456")
-        self.bar_user = User.objects.create_user("bar_user", "[email protected]", "123456")
+        self.foo_user = UserModel.objects.create_user("foo_user", "[email protected]", "123456")
+        self.bar_user = UserModel.objects.create_user("bar_user", "[email protected]", "123456")
 
     def tearDown(self):
         self.foo_user.delete()

oauth2_provider/tests/test_authorization_code.py

@@ -3,11 +3,10 @@
 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
+from ..compat import urlparse, parse_qs, urlencode, get_user_model
 from ..models import get_application_model, Grant
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
@@ -16,6 +15,7 @@
 
 
 Application = get_application_model()
+UserModel = get_user_model()
 
 
 # mocking a protected resource view
@@ -27,8 +27,8 @@ def get(self, request, *args, **kwargs):
 class BaseTest(TestCaseUtils, TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = User.objects.create_user("test_user", "[email protected]", "123456")
-        self.dev_user = User.objects.create_user("dev_user", "[email protected]", "123456")
+        self.test_user = UserModel.objects.create_user("test_user", "[email protected]", "123456")
+        self.dev_user = UserModel.objects.create_user("dev_user", "[email protected]", "123456")
 
         self.application = Application(
             name="Test Application",

oauth2_provider/tests/test_client_credential.py

@@ -2,7 +2,6 @@
 
 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
@@ -14,10 +13,12 @@
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
 from ..views.mixins import OAuthLibMixin
+from ..compat import get_user_model
 from .test_utils import TestCaseUtils
 
 
 Application = get_application_model()
+UserModel = get_user_model()
 
 
 # mocking a protected resource view
@@ -29,8 +30,8 @@ def get(self, request, *args, **kwargs):
 class BaseTest(TestCaseUtils, TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = User.objects.create_user("test_user", "[email protected]", "123456")
-        self.dev_user = User.objects.create_user("dev_user", "[email protected]", "123456")
+        self.test_user = UserModel.objects.create_user("test_user", "[email protected]", "123456")
+        self.dev_user = UserModel.objects.create_user("dev_user", "[email protected]", "123456")
 
         self.application = Application(
             name="test_client_credentials_app",

oauth2_provider/tests/test_decorators.py

@@ -2,16 +2,17 @@
 from datetime import timedelta
 
 from django.test import TestCase, RequestFactory
-from django.contrib.auth.models import User
 from django.utils import timezone
 
 from ..decorators import protected_resource, rw_protected_resource
 from ..settings import oauth2_settings
 from ..models import get_application_model, AccessToken
+from ..compat import get_user_model
 from .test_utils import TestCaseUtils
 
 
 Application = get_application_model()
+UserModel = get_user_model()
 
 
 class TestProtectedResourceDecorator(TestCase, TestCaseUtils):
@@ -20,7 +21,7 @@ def setUpClass(cls):
         cls.request_factory = RequestFactory()
 
     def setUp(self):
-        self.user = User.objects.create_user("test_user", "[email protected]", "123456")
+        self.user = UserModel.objects.create_user("test_user", "[email protected]", "123456")
         self.application = Application.objects.create(
             name="test_client_credentials_app",
             user=self.user,

oauth2_provider/tests/test_generator.py

@@ -3,8 +3,8 @@
 from django.test import TestCase
 
 from ..settings import oauth2_settings
-from ..generators import BaseHashGenerator, ClientIdGenerator, ClientSecretGenerator, generate_client_id, \
-    generate_client_secret
+from ..generators import (BaseHashGenerator, ClientIdGenerator, ClientSecretGenerator,
+                          generate_client_id, generate_client_secret)
 
 
 class MockHashGenerator(BaseHashGenerator):

oauth2_provider/tests/test_implicit.py

@@ -1,16 +1,16 @@
 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
+from ..compat import urlparse, parse_qs, urlencode, get_user_model
 from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
 
 
 Application = get_application_model()
+UserModel = get_user_model()
 
 
 # mocking a protected resource view
@@ -22,8 +22,8 @@ def get(self, request, *args, **kwargs):
 class BaseTest(TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = User.objects.create_user("test_user", "[email protected]", "123456")
-        self.dev_user = User.objects.create_user("dev_user", "[email protected]", "123456")
+        self.test_user = UserModel.objects.create_user("test_user", "[email protected]", "123456")
+        self.dev_user = UserModel.objects.create_user("dev_user", "[email protected]", "123456")
 
         self.application = Application(
             name="Test Implicit Application",

oauth2_provider/tests/test_models.py

@@ -1,18 +1,19 @@
 from __future__ import unicode_literals
 
 from django.test import TestCase
-from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 
 from ..models import AccessToken, get_application_model
+from ..compat import get_user_model
 
 
 Application = get_application_model()
+UserModel = get_user_model()
 
 
 class TestModels(TestCase):
     def setUp(self):
-        self.user = User.objects.create_user("test_user", "[email protected]", "123456")
+        self.user = UserModel.objects.create_user("test_user", "[email protected]", "123456")
 
     def test_allow_scopes(self):
         self.client.login(username="test_user", password="123456")

oauth2_provider/tests/test_password.py

@@ -3,17 +3,17 @@
 import json
 
 from django.test import TestCase, RequestFactory
-from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 
 from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
-
+from ..compat import get_user_model
 from .test_utils import TestCaseUtils
 
 
 Application = get_application_model()
+UserModel = get_user_model()
 
 
 # mocking a protected resource view
@@ -25,8 +25,8 @@ def get(self, request, *args, **kwargs):
 class BaseTest(TestCaseUtils, TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = User.objects.create_user("test_user", "[email protected]", "123456")
-        self.dev_user = User.objects.create_user("dev_user", "[email protected]", "123456")
+        self.test_user = UserModel.objects.create_user("test_user", "[email protected]", "123456")
+        self.dev_user = UserModel.objects.create_user("dev_user", "[email protected]", "123456")
 
         self.application = Application(
             name="Test Password Application",

oauth2_provider/tests/test_rest_framework.py

@@ -1,6 +1,5 @@
 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
@@ -10,9 +9,11 @@
 from .test_utils import TestCaseUtils
 from ..models import AccessToken, get_application_model
 from ..settings import oauth2_settings
+from ..compat import get_user_model
 
 
 Application = get_application_model()
+UserModel = get_user_model()
 
 
 try:
@@ -65,8 +66,8 @@ class TestOAuth2Authentication(BaseTest):
     def setUp(self):
         oauth2_settings._SCOPES = ['read', 'write', 'scope1', 'scope2']
 
-        self.test_user = User.objects.create_user("test_user", "[email protected]", "123456")
-        self.dev_user = User.objects.create_user("dev_user", "[email protected]", "123456")
+        self.test_user = UserModel.objects.create_user("test_user", "[email protected]", "123456")
+        self.dev_user = UserModel.objects.create_user("dev_user", "[email protected]", "123456")
 
         self.application = Application.objects.create(
             name="Test Application",

oauth2_provider/tests/test_scopes.py

@@ -3,19 +3,17 @@
 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
+from .test_utils import TestCaseUtils
+from ..compat import urlparse, parse_qs, get_user_model
 from ..models import get_application_model, Grant, AccessToken
 from ..settings import oauth2_settings
 from ..views import ScopedProtectedResourceView, ReadWriteScopedResourceView
 
-from .test_utils import TestCaseUtils
-
-
 Application = get_application_model()
+UserModel = get_user_model()
 
 
 # mocking a protected resource view
@@ -44,8 +42,8 @@ def post(self, request, *args, **kwargs):
 class BaseTest(TestCaseUtils, TestCase):
     def setUp(self):
         self.factory = RequestFactory()
-        self.test_user = User.objects.create_user("test_user", "[email protected]", "123456")
-        self.dev_user = User.objects.create_user("dev_user", "[email protected]", "123456")
+        self.test_user = UserModel.objects.create_user("test_user", "[email protected]", "123456")
+        self.dev_user = UserModel.objects.create_user("dev_user", "[email protected]", "123456")
 
         self.application = Application(
             name="Test Application",