From 1b49615c00793b658f40d08617965316a3f71a7e Mon Sep 17 00:00:00 2001
From: Jacob Magnusson
Date: Sat, 3 Nov 2012 00:32:02 +0100
Subject: Added test that makes sure that fields with dictionaries as data are
 returned as expected and not turned into string representations

---
 rest_framework/tests/models.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'rest_framework/tests/models.py')

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 415e4d06..1a0078e8 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -122,6 +122,13 @@ class Person(RESTFrameworkModel):
     name = models.CharField(max_length=10)
     age = models.IntegerField(null=True, blank=True)
 
+    @property
+    def info(self):
+        return {
+            'name': self.name,
+            'age': self.age,
+        }
+
 
 # Model for issue #324
 class BlankFieldModel(RESTFrameworkModel):
-- 
cgit v1.2.3


From 03095f607a4f110c1dc831a394f6b480a691f1fd Mon Sep 17 00:00:00 2001
From: Stephan Groß
Date: Mon, 5 Nov 2012 16:37:37 +0100
Subject: added testcase for custom slug field in hyperlinkedrelatedfield

---
 rest_framework/tests/models.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'rest_framework/tests/models.py')

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 1a0078e8..0e23734e 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -118,6 +118,15 @@ class BlogPostComment(RESTFrameworkModel):
     blog_post = models.ForeignKey(BlogPost)
 
 
+class Album(RESTFrameworkModel):
+    title = models.CharField(max_length=100, unique=True)
+
+
+class Photo(RESTFrameworkModel):
+    description = models.TextField()
+    album = models.ForeignKey(Album)
+
+
 class Person(RESTFrameworkModel):
     name = models.CharField(max_length=10)
     age = models.IntegerField(null=True, blank=True)
-- 
cgit v1.2.3