Ticket #18172: bug-18172-testcase.patch

tests/modeltests/model_forms/models.py

@@ -272 +272 @@
     slug = models.CharField(max_length=50, unique_for_year='posted', blank=True)
     subtitle = models.CharField(max_length=50, unique_for_month='posted', blank=True)
     posted = models.DateField(blank=True, null=True)
+
+@python_2_unicode_compatible
+class Seller(models.Model) :
+    name = models.CharField(max_length=50)
+
+    def __iter__(self) :
+        for item in self.items.all() :
+            yield item
+
+    def __str__(self) :
+        return self.name
+
+class Antique(models.Model) :
+    owner = models.ForeignKey(Seller, related_name='items')
+    name = models.CharField(max_length=50)
+
+class Auction(models.Model) :
+    location = models.CharField(max_length=50)
+    sellers = models.ManyToManyField(Seller)

tests/modeltests/model_forms/tests.py

@@ -17 +17 @@
     Category, CommaSeparatedInteger, CustomFieldForExclusionModel, DerivedBook,
     DerivedPost, ExplicitPK, FlexibleDatePost, ImprovedArticle,
     ImprovedArticleWithParentLink, Inventory, PhoneNumber, Post, Price,
-    Product, TextFile, Writer, WriterProfile, test_images)
+    Product, TextFile, Writer, WriterProfile, Seller, Antique, Auction,
+    test_images)
 
 if test_images:
     from .models import ImageFile, OptionalImageFile
@@ -176 +177 @@
         model = Price
         exclude = ('quantity',)
 
+class AuctionForm(forms.ModelForm) :
+    class Meta:
+        model = Auction
 
 class ModelFormBaseTest(TestCase):
     def test_base_form(self):
@@ -1484 +1488 @@
                          ['name'])
         self.assertHTMLEqual(six.text_type(CustomFieldForExclusionForm()),
                          '''<tr><th><label for="id_name">Name:</label></th><td><input id="id_name" type="text" name="name" maxlength="10" /></td></tr>''')
+
+    def test_iterable_model_m2m(self) :
+        john = Seller.objects.create(name='John Smith')
+        jane = Seller.objects.create(name='Jane Smith')
+        chair = Antique.objects.create(name='Victorian armchair', owner=john)
+        table = Antique.objects.create(name='Victorian table', owner=john)
+        bowl = Antique.objects.create(name='Mayan medicine bowl', owner=jane)
+        form = AuctionForm()
+        self.assertHTMLEqual(form.as_p(), """<p><label for="id_location">Location:</label> <input id="id_location" type="text" name="location" maxlength="50" /></p>
+        <p><label for="id_sellers">Sellers:</label> <select multiple="multiple" name="sellers" id="id_sellers">
+        <option value="1">John Smith</option>
+        <option value="2">Jane Smith</option>
+        </select> <span class="helptext"> Hold down "Control", or "Command" on a Mac, to select more than one.</span></p>""")