From ca5b99486d15e7392754178ab0948de2a60763a3 Mon Sep 17 00:00:00 2001
From: Marko Tibold
Date: Thu, 22 Nov 2012 22:36:37 +0100
Subject: Added _post_clean() behaviour by adding a .perform_model_validation()
 method. Fixed some tests that were failing due to extra strict validation.

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

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

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index c35861c6..9a59e841 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -61,7 +61,7 @@ class BasicModel(RESTFrameworkModel):
 
 class SlugBasedModel(RESTFrameworkModel):
     text = models.CharField(max_length=100)
-    slug = models.SlugField(max_length=32)
+    slug = models.SlugField(max_length=32, blank=True)
 
 
 class DefaultValueModel(RESTFrameworkModel):
@@ -159,7 +159,7 @@ class Person(RESTFrameworkModel):
 
 # Model for issue #324
 class BlankFieldModel(RESTFrameworkModel):
-    title = models.CharField(max_length=100, blank=True)
+    title = models.CharField(max_length=100, blank=True, null=True)
 
 
 # Model for issue #380
-- 
cgit v1.2.3


From e311b763e193b41c6a679ddbcf813702691145a0 Mon Sep 17 00:00:00 2001
From: Pavel Savchenko
Date: Fri, 30 Nov 2012 01:34:46 +0200
Subject: add traverse_related feature + tests (fixes issue#461)

---
 rest_framework/tests/models.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

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

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index c35861c6..76435df8 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -124,8 +124,21 @@ class ActionItem(RESTFrameworkModel):
 
 
 # Models for reverse relations
+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,
+        }
+
+
 class BlogPost(RESTFrameworkModel):
     title = models.CharField(max_length=100)
+    writer = models.ForeignKey(Person, null=True, blank=True)
 
     def get_first_comment(self):
         return self.blogpostcomment_set.all()[0]
@@ -145,18 +158,6 @@ class Photo(RESTFrameworkModel):
     album = models.ForeignKey(Album)
 
 
-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):
     title = models.CharField(max_length=100, blank=True)
-- 
cgit v1.2.3


From 35f72cecb199e1790a42fadd6037da43cdd5a05a Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 15 Dec 2012 20:40:41 +0000
Subject: Fix model validation exclusions.  Fixes #500.  Fixes #506.

---
 rest_framework/tests/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 428bf130..e2b287d0 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -61,7 +61,7 @@ class BasicModel(RESTFrameworkModel):
 
 class SlugBasedModel(RESTFrameworkModel):
     text = models.CharField(max_length=100)
-    slug = models.SlugField(max_length=32, blank=True)
+    slug = models.SlugField(max_length=32)
 
 
 class DefaultValueModel(RESTFrameworkModel):
-- 
cgit v1.2.3


From 01e06bcdf8a4678a312acbf11638fa6a033c50d6 Mon Sep 17 00:00:00 2001
From: Joel Marcotte
Date: Sat, 15 Dec 2012 16:33:08 -0500
Subject: Added test for "positive_integer in choices tuple does not get parsed
 if not string".

Signed-off-by: Joel Marcotte <skaner@gmail.com>
---
 rest_framework/tests/models.py | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 428bf130..807bcf98 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -51,6 +51,10 @@ class RESTFrameworkModel(models.Model):
         abstract = True
 
 
+class HasPositiveIntegerAsChoice(RESTFrameworkModel):
+    some_choices = ((1,'A'),(2,'B'),(3,'C'))
+    some_integer = models.PositiveIntegerField(choices=some_choices)
+
 class Anchor(RESTFrameworkModel):
     text = models.CharField(max_length=100, default='anchor')
 
-- 
cgit v1.2.3


From a493c83248535c9fa7f78815b16bce7e88bf7966 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 19 Dec 2012 23:12:27 +0000
Subject: urls, patterns, include imports move to compat to support incoming
 1.3 thru 1.6 import compatability

---
 rest_framework/tests/models.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 1b1def30..0759650a 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -52,9 +52,10 @@ class RESTFrameworkModel(models.Model):
 
 
 class HasPositiveIntegerAsChoice(RESTFrameworkModel):
-    some_choices = ((1,'A'),(2,'B'),(3,'C'))
+    some_choices = ((1, 'A'), (2, 'B'), (3, 'C'))
     some_integer = models.PositiveIntegerField(choices=some_choices)
 
+
 class Anchor(RESTFrameworkModel):
     text = models.CharField(max_length=100, default='anchor')
 
@@ -164,7 +165,7 @@ class Photo(RESTFrameworkModel):
 
 # Model for issue #324
 class BlankFieldModel(RESTFrameworkModel):
-    title = models.CharField(max_length=100, blank=True, null=True)
+    title = models.CharField(max_length=100, blank=True, null=False)
 
 
 # Model for issue #380
-- 
cgit v1.2.3