Update testing strategy to what DRF is using

Author: jpadilla

.travis.yml

@@ -16,7 +16,7 @@ install:
   - pip install -r requirements.txt
 
 script:
-  - python setup.py test
+  - ./runtests.py
 
 matrix:
   exclude:

requirements-test.txt

@@ -0,0 +1,5 @@
+# Test requirements
+pytest-django==2.6
+pytest==2.5.2
+pytest-cov==1.6
+flake8==2.2.2

rest_framework_jwt/models.py

@@ -1 +1 @@
-# Just to keep things like ./manage.py test happy
+# Just to keep things like ./manage.py test happy

rest_framework_jwt/runtests/runtests.py

@@ -2,9 +2,10 @@
 from datetime import datetime, timedelta
 import jwt
 
-from django.contrib.auth import authenticate, get_user_model
+from django.contrib.auth import authenticate
 from rest_framework import serializers
 
+from rest_framework_jwt import utils
 from rest_framework_jwt.settings import api_settings
 
 
@@ -32,7 +33,12 @@ def __init__(self, *args, **kwargs):
 
     @property
     def username_field(self):
-        return get_user_model().USERNAME_FIELD
+        User = utils.get_user_model()
+
+        try:
+            return User.USERNAME_FIELD
+        except AttributeError:
+            return 'username'
 
     def validate(self, attrs):
         credentials = {self.username_field: attrs.get(self.username_field),
@@ -72,6 +78,7 @@ class RefreshJSONWebTokenSerializer(serializers.Serializer):
     token = serializers.CharField()
 
     def validate(self, attrs):
+        User = utils.get_user_model()
         token = attrs['token']
 
         # Check payload valid (based off of JSONWebTokenAuthentication,
@@ -86,34 +93,38 @@ def validate(self, attrs):
             raise serializers.ValidationError(msg)
 
         # Make sure user exists (may want to refactor this)
-        User = get_user_model()
         try:
             user_id = jwt_get_user_id_from_payload(payload)
+
             if user_id:
                 user = User.objects.get(pk=user_id, is_active=True)
             else:
                 msg = 'Invalid payload'
                 raise serializers.ValidationError(msg)
         except User.DoesNotExist:
-            raise serializers.ValidationError("User doesn't exist")
+            msg = "User doesn't exist"
+            raise serializers.ValidationError(msg)
 
         # Get and check 'orig_iat'
         orig_iat = payload.get('orig_iat')
+
         if orig_iat:
             # Verify expiration
             refresh_limit = api_settings.JWT_REFRESH_EXPIRATION_DELTA
+
             if isinstance(refresh_limit, timedelta):
                 refresh_limit = (refresh_limit.days * 24 * 3600 +
                                  refresh_limit.seconds)
-            expiration_timestamp = (
-                orig_iat +
-                int(refresh_limit)
-            )
+
+            expiration_timestamp = orig_iat + int(refresh_limit)
             now_timestamp = timegm(datetime.utcnow().utctimetuple())
+
             if now_timestamp > expiration_timestamp:
-                raise serializers.ValidationError("Refresh has expired")
+                msg = 'Refresh has expired'
+                raise serializers.ValidationError(msg)
         else:
-            raise serializers.ValidationError("orig_iat field is required")
+            msg = 'orig_iat field is required'
+            raise serializers.ValidationError(msg)
 
         new_payload = jwt_payload_handler(user)
         new_payload['orig_iat'] = orig_iat

rest_framework_jwt/runtests/settings.py

@@ -28,6 +28,8 @@
 
     'JWT_ALLOW_REFRESH': False,
     'JWT_REFRESH_EXPIRATION_DELTA': datetime.timedelta(days=7),
+
+    'JWT_AUTH_HEADER_PREFIX': 'JWT'
 }
 
 # List of settings that may be in string import notation.

rest_framework_jwt/runtests/urls.py

@@ -4,11 +4,29 @@
 from rest_framework_jwt.settings import api_settings
 
 
+def get_user_model():
+    try:
+        from django.contrib.auth import get_user_model
+    except ImportError:  # django < 1.5
+        from django.contrib.auth.models import User
+    else:
+        User = get_user_model()
+
+    return User
+
+
 def jwt_payload_handler(user):
+    try:
+        username = user.get_username()
+    except AttributeError:
+        username = user.username
+
+    print(username)
+
     return {
         'user_id': user.pk,
         'email': user.email,
-        'username': user.get_username(),
+        'username': username,
         'exp': datetime.utcnow() + api_settings.JWT_EXPIRATION_DELTA
     }