diff options
Diffstat (limited to 'tests/generic_relations/tests.py')
| -rw-r--r-- | tests/generic_relations/tests.py | 57 |
1 files changed, 48 insertions, 9 deletions
diff --git a/tests/generic_relations/tests.py b/tests/generic_relations/tests.py index c800bd77b0..e9bd748329 100644 --- a/tests/generic_relations/tests.py +++ b/tests/generic_relations/tests.py @@ -403,12 +403,30 @@ class GenericRelationsTests(TestCase): def test_generic_inline_formsets(self): GenericFormSet = generic_inlineformset_factory(TaggedItem, extra=1) formset = GenericFormSet() - self.assertHTMLEqual(''.join(form.as_p() for form in formset.forms), """<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-0-tag" maxlength="50" /></p> -<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">Delete:</label> <input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-0-DELETE" id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE" /><input type="hidden" name="generic_relations-taggeditem-content_type-object_id-0-id" id="id_generic_relations-taggeditem-content_type-object_id-0-id" /></p>""") + self.assertHTMLEqual( + ''.join(form.as_p() for form in formset.forms), + """<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag"> +Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" type="text" +name="generic_relations-taggeditem-content_type-object_id-0-tag" maxlength="50" /></p> +<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">Delete:</label> +<input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-0-DELETE" +id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE" /> +<input type="hidden" name="generic_relations-taggeditem-content_type-object_id-0-id" +id="id_generic_relations-taggeditem-content_type-object_id-0-id" /></p>""" + ) formset = GenericFormSet(instance=Animal()) - self.assertHTMLEqual(''.join(form.as_p() for form in formset.forms), """<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-0-tag" maxlength="50" /></p> -<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">Delete:</label> <input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-0-DELETE" id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE" /><input type="hidden" name="generic_relations-taggeditem-content_type-object_id-0-id" id="id_generic_relations-taggeditem-content_type-object_id-0-id" /></p>""") + self.assertHTMLEqual( + ''.join(form.as_p() for form in formset.forms), + """<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag"> +Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" +type="text" name="generic_relations-taggeditem-content_type-object_id-0-tag" maxlength="50" /></p> +<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">Delete:</label> +<input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-0-DELETE" +id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE" /><input type="hidden" +name="generic_relations-taggeditem-content_type-object_id-0-id" +id="id_generic_relations-taggeditem-content_type-object_id-0-id" /></p>""" + ) platypus = Animal.objects.create( common_name="Platypus", latin_name="Ornithorhynchus anatinus" @@ -419,14 +437,35 @@ class GenericRelationsTests(TestCase): tagged_item_id = TaggedItem.objects.get( tag='shiny', object_id=platypus.id ).id - self.assertHTMLEqual(''.join(form.as_p() for form in formset.forms), """<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-0-tag" value="shiny" maxlength="50" /></p> -<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">Delete:</label> <input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-0-DELETE" id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE" /><input type="hidden" name="generic_relations-taggeditem-content_type-object_id-0-id" value="%s" id="id_generic_relations-taggeditem-content_type-object_id-0-id" /></p><p><label for="id_generic_relations-taggeditem-content_type-object_id-1-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-1-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-1-tag" maxlength="50" /></p> -<p><label for="id_generic_relations-taggeditem-content_type-object_id-1-DELETE">Delete:</label> <input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-1-DELETE" id="id_generic_relations-taggeditem-content_type-object_id-1-DELETE" /><input type="hidden" name="generic_relations-taggeditem-content_type-object_id-1-id" id="id_generic_relations-taggeditem-content_type-object_id-1-id" /></p>""" % tagged_item_id) + self.assertHTMLEqual( + ''.join(form.as_p() for form in formset.forms), + """<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag">Tag:</label> +<input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" type="text" +name="generic_relations-taggeditem-content_type-object_id-0-tag" value="shiny" maxlength="50" /></p> +<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">Delete:</label> +<input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-0-DELETE" +id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE" /> +<input type="hidden" name="generic_relations-taggeditem-content_type-object_id-0-id" +value="%s" id="id_generic_relations-taggeditem-content_type-object_id-0-id" /></p> +<p><label for="id_generic_relations-taggeditem-content_type-object_id-1-tag">Tag:</label> +<input id="id_generic_relations-taggeditem-content_type-object_id-1-tag" type="text" +name="generic_relations-taggeditem-content_type-object_id-1-tag" maxlength="50" /></p> +<p><label for="id_generic_relations-taggeditem-content_type-object_id-1-DELETE">Delete:</label> +<input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-1-DELETE" +id="id_generic_relations-taggeditem-content_type-object_id-1-DELETE" /> +<input type="hidden" name="generic_relations-taggeditem-content_type-object_id-1-id" +id="id_generic_relations-taggeditem-content_type-object_id-1-id" /></p>""" % tagged_item_id + ) lion = Animal.objects.create(common_name="Lion", latin_name="Panthera leo") formset = GenericFormSet(instance=lion, prefix='x') - self.assertHTMLEqual(''.join(form.as_p() for form in formset.forms), """<p><label for="id_x-0-tag">Tag:</label> <input id="id_x-0-tag" type="text" name="x-0-tag" maxlength="50" /></p> -<p><label for="id_x-0-DELETE">Delete:</label> <input type="checkbox" name="x-0-DELETE" id="id_x-0-DELETE" /><input type="hidden" name="x-0-id" id="id_x-0-id" /></p>""") + self.assertHTMLEqual( + ''.join(form.as_p() for form in formset.forms), + """<p><label for="id_x-0-tag">Tag:</label> +<input id="id_x-0-tag" type="text" name="x-0-tag" maxlength="50" /></p> +<p><label for="id_x-0-DELETE">Delete:</label> <input type="checkbox" name="x-0-DELETE" id="id_x-0-DELETE" /> +<input type="hidden" name="x-0-id" id="id_x-0-id" /></p>""" + ) def test_gfk_manager(self): # GenericForeignKey should not use the default manager (which may filter objects) #16048 |