mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
Refs #33476 -- Refactored code to strictly match 88 characters line length.
This commit is contained in:
@@ -71,7 +71,12 @@ class M2MThroughSerializationTestCase(TestCase):
|
||||
|
||||
def test_serialization(self):
|
||||
"m2m-through models aren't serialized as m2m fields. Refs #8134"
|
||||
pks = {"p_pk": self.bob.pk, "g_pk": self.roll.pk, "m_pk": self.bob_roll.pk}
|
||||
pks = {
|
||||
"p_pk": self.bob.pk,
|
||||
"g_pk": self.roll.pk,
|
||||
"m_pk": self.bob_roll.pk,
|
||||
"app_label": "m2m_through_regress",
|
||||
}
|
||||
|
||||
out = StringIO()
|
||||
management.call_command(
|
||||
@@ -79,10 +84,12 @@ class M2MThroughSerializationTestCase(TestCase):
|
||||
)
|
||||
self.assertJSONEqual(
|
||||
out.getvalue().strip(),
|
||||
'[{"pk": %(m_pk)s, "model": "m2m_through_regress.membership", "fields": {"person": %(p_pk)s, "price": '
|
||||
'100, "group": %(g_pk)s}}, {"pk": %(p_pk)s, "model": "m2m_through_regress.person", "fields": {"name": '
|
||||
'"Bob"}}, {"pk": %(g_pk)s, "model": "m2m_through_regress.group", "fields": {"name": "Roll"}}]'
|
||||
% pks,
|
||||
'[{"pk": %(m_pk)s, "model": "m2m_through_regress.membership", '
|
||||
'"fields": {"person": %(p_pk)s, "price": 100, "group": %(g_pk)s}}, '
|
||||
'{"pk": %(p_pk)s, "model": "m2m_through_regress.person", '
|
||||
'"fields": {"name": "Bob"}}, '
|
||||
'{"pk": %(g_pk)s, "model": "m2m_through_regress.group", '
|
||||
'"fields": {"name": "Roll"}}]' % pks,
|
||||
)
|
||||
|
||||
out = StringIO()
|
||||
@@ -94,15 +101,15 @@ class M2MThroughSerializationTestCase(TestCase):
|
||||
"""
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<django-objects version="1.0">
|
||||
<object pk="%(m_pk)s" model="m2m_through_regress.membership">
|
||||
<field to="m2m_through_regress.person" name="person" rel="ManyToOneRel">%(p_pk)s</field>
|
||||
<field to="m2m_through_regress.group" name="group" rel="ManyToOneRel">%(g_pk)s</field>
|
||||
<object pk="%(m_pk)s" model="%(app_label)s.membership">
|
||||
<field to="%(app_label)s.person" name="person" rel="ManyToOneRel">%(p_pk)s</field>
|
||||
<field to="%(app_label)s.group" name="group" rel="ManyToOneRel">%(g_pk)s</field>
|
||||
<field type="IntegerField" name="price">100</field>
|
||||
</object>
|
||||
<object pk="%(p_pk)s" model="m2m_through_regress.person">
|
||||
<object pk="%(p_pk)s" model="%(app_label)s.person">
|
||||
<field type="CharField" name="name">Bob</field>
|
||||
</object>
|
||||
<object pk="%(g_pk)s" model="m2m_through_regress.group">
|
||||
<object pk="%(g_pk)s" model="%(app_label)s.group">
|
||||
<field type="CharField" name="name">Roll</field>
|
||||
</object>
|
||||
</django-objects>
|
||||
@@ -223,7 +230,10 @@ class ThroughLoadDataTestCase(TestCase):
|
||||
)
|
||||
self.assertJSONEqual(
|
||||
out.getvalue().strip(),
|
||||
'[{"pk": 1, "model": "m2m_through_regress.usermembership", "fields": {"price": 100, "group": 1, "user"'
|
||||
': 1}}, {"pk": 1, "model": "m2m_through_regress.person", "fields": {"name": "Guido"}}, {"pk": 1, '
|
||||
'"model": "m2m_through_regress.group", "fields": {"name": "Python Core Group"}}]',
|
||||
'[{"pk": 1, "model": "m2m_through_regress.usermembership", '
|
||||
'"fields": {"price": 100, "group": 1, "user": 1}}, '
|
||||
'{"pk": 1, "model": "m2m_through_regress.person", '
|
||||
'"fields": {"name": "Guido"}}, '
|
||||
'{"pk": 1, "model": "m2m_through_regress.group", '
|
||||
'"fields": {"name": "Python Core Group"}}]',
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user