From b5128ca574d03ea590a198b04043142a3fc7163e Mon Sep 17 00:00:00 2001
From: David Muller
Date: Sun, 18 Jan 2015 15:19:11 -0800
Subject: Save objects before assigning them in
 InheritedModelSerializationTests; Django 1.8 now throws an error when
 assigning unsaved objects to Foreign Key, GenericForeignKey, and
 OneToOneFields

---
 tests/test_multitable_inheritance.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py
index e1b40cc7..15627e1d 100644
--- a/tests/test_multitable_inheritance.py
+++ b/tests/test_multitable_inheritance.py
@@ -48,8 +48,8 @@ class InheritedModelSerializationTests(TestCase):
         Assert that a model with a onetoone field that is the primary key is
         not treated like a derived model
         """
-        parent = ParentModel(name1='parent name')
-        associate = AssociatedModel(name='hello', ref=parent)
+        parent = ParentModel.objects.create(name1='parent name')
+        associate = AssociatedModel.objects.create(name='hello', ref=parent)
         serializer = AssociatedModelSerializer(associate)
         self.assertEqual(set(serializer.data.keys()),
                          set(['name', 'ref']))
-- 
cgit v1.2.3


From 4f3c3a06cfc0ea2dfbf46da2d98546664343ce93 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 19 Jan 2015 14:41:10 +0000
Subject: Drop trailing whitespace on indented JSON output. Closes #2429.

---
 tests/test_renderers.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/test_renderers.py b/tests/test_renderers.py
index 7b78f7ba..3e64d8fe 100644
--- a/tests/test_renderers.py
+++ b/tests/test_renderers.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-
 from django.conf.urls import patterns, url, include
 from django.core.cache import cache
 from django.db import models
@@ -8,6 +7,7 @@ from django.test import TestCase
 from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import status, permissions
+from rest_framework.compat import OrderedDict
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework.renderers import BaseRenderer, JSONRenderer, BrowsableAPIRenderer
@@ -489,3 +489,25 @@ class CacheRenderTest(TestCase):
         cached_resp = cache.get(self.cache_key)
         self.assertIsInstance(cached_resp, Response)
         self.assertEqual(cached_resp.content, resp.content)
+
+
+class TestJSONIndentationStyles:
+    def test_indented(self):
+        renderer = JSONRenderer()
+        data = OrderedDict([('a', 1), ('b', 2)])
+        assert renderer.render(data) == b'{"a":1,"b":2}'
+
+    def test_compact(self):
+        renderer = JSONRenderer()
+        data = OrderedDict([('a', 1), ('b', 2)])
+        context = {'indent': 4}
+        assert (
+            renderer.render(data, renderer_context=context) ==
+            b'{\n    "a": 1,\n    "b": 2\n}'
+        )
+
+    def test_long_form(self):
+        renderer = JSONRenderer()
+        renderer.compact = False
+        data = OrderedDict([('a', 1), ('b', 2)])
+        assert renderer.render(data) == b'{"a": 1, "b": 2}'
-- 
cgit v1.2.3