Fix tests to work with DRF 3.6.3. (#351)

* Fix tests to work with DRF 3.6.3.

Fixes #350

* Avoid raising a KeyError.

This test checked a condition that created a RuntimeError in the past.
In this newer version of DRF, the field is not included so the key
should be ignored when not present.

Author: mblayman

AUTHORS

@@ -1,6 +1,7 @@
-Jerel Unruh <mail@unruhdesigns.com>
-Greg Aker <greg@gregaker.net>
 Adam Wróbel <https://adamwrobel.com>
 Christian Zosel <https://zosel.ch>
+Greg Aker <greg@gregaker.net>
+Jerel Unruh <mail@unruhdesigns.com>
+Matt Layman <http://www.mattlayman.com>
 Oliver Sauder <os@esite.ch>
 

example/serializers.py

@@ -37,12 +37,12 @@ class Meta:
 class EntrySerializer(serializers.ModelSerializer):
 
     def __init__(self, *args, **kwargs):
+        super(EntrySerializer, self).__init__(*args, **kwargs)
         # to make testing more concise we'll only output the
         # `featured` field when it's requested via `include`
         request = kwargs.get('context', {}).get('request')
         if request and 'featured' not in request.query_params.get('include', []):
-            self.fields.pop('featured')
-        super(EntrySerializer, self).__init__(*args, **kwargs)
+            self.fields.pop('featured', None)
 
     included_serializers = {
         'authors': 'example.serializers.AuthorSerializer',

rest_framework_json_api/serializers.py

@@ -50,6 +50,7 @@ def to_internal_value(self, data):
 
 class SparseFieldsetsMixin(object):
     def __init__(self, *args, **kwargs):
+        super(SparseFieldsetsMixin, self).__init__(*args, **kwargs)
         context = kwargs.get('context')
         request = context.get('request') if context else None
 
@@ -74,8 +75,6 @@ def __init__(self, *args, **kwargs):
                     if field_name not in fieldset:
                         self.fields.pop(field_name)
 
-        super(SparseFieldsetsMixin, self).__init__(*args, **kwargs)
-
 
 class IncludedResourcesValidationMixin(object):
     def __init__(self, *args, **kwargs):