Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restapi/client: don't use DRF parser for parsing #4160

Merged
merged 1 commit into from
Oct 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions readthedocs/restapi/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import requests
from django.conf import settings
from requests_toolbelt.adapters import host_header_ssl
from rest_framework.parsers import JSONParser
from rest_framework.renderers import JSONRenderer
from slumber import API, serialize

Expand All @@ -24,13 +23,10 @@

class DrfJsonSerializer(serialize.JsonSerializer):

"""Additional serialization help from the DRF parser/renderer."""
"""Additional serialization help from the DRF renderer"""

key = 'json-drf'

def loads(self, data):
return JSONParser().parse(data)

def dumps(self, data):
return JSONRenderer().render(data)

Expand Down
24 changes: 24 additions & 0 deletions readthedocs/rtd_tests/tests/test_restapi_client.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import (
absolute_import, unicode_literals)

from django.test import TestCase

from readthedocs.restapi.client import DrfJsonSerializer


class TestDrfJsonSerializer(TestCase):
data = {
'proper': 'json'
}
serialized_data = '{"proper":"json"}'

def test_serializer_loads_json(self):
serializer = DrfJsonSerializer()
data = serializer.loads(self.serialized_data)
self.assertDictEqual(data, self.data)

def test_serializer_dumps_json(self):
serializer = DrfJsonSerializer()
serialized_data = serializer.dumps(self.data)
self.assertJSONEqual(serialized_data, self.serialized_data)