Ticket #6967: 6967-tests.diff

tests/modeltests/model_forms/models.py

@@ -27 +27 @@
-    (3, 'Live'),
-)
-
+ARTICLE_STATUS_CHAR = (
+    ('d', 'Draft'),
+    ('p', 'Pending'),
+    ('l', 'Live'),
+)
+
-class Category(models.Model):
-    name = models.CharField(max_length=20)
-    slug = models.SlugField(max_length=20)
@@ -111 +117 @@
-    def __unicode__(self):
-        return self.field
-
+class ArticleStatus(models.Model):
+    status = models.CharField(max_length=2, choices=ARTICLE_STATUS_CHAR, blank=True, null=True)
+
-__test__ = {'API_TESTS': """
->>> from django import forms
->>> from django.forms.models import ModelForm, model_to_dict
@@ -1123 +1132 @@
->>> f.clean('1')
-u'1'
-
+# Choices on CharField and IntegerField
+
+>>> class ArticleForm(ModelForm):
+...     class Meta:
+...         model = Article
+>>> f = ArticleForm()
+>>> f.fields['status'].clean('42')
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. 42 is not one of the available choices.']
+
+>>> class ArticleStatusForm(ModelForm):
+...     class Meta:
+...         model = ArticleStatus
+>>> f = ArticleStatusForm()
+>>> f.fields['status'].clean('z')
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. z is not one of the available choices.']
+
-"""}