diff options
author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2022-02-04 08:08:27 +0100 |
---|---|---|
committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2022-02-07 20:37:05 +0100 |
commit | 7119f40c9881666b6f9b5cf7df09ee1d21cc8344 (patch) | |
tree | fa50869f5614295f462d9bf77fec59365c621609 /tests/m2m_through_regress | |
parent | 9c19aff7c7561e3a82978a272ecdaad40dda5c00 (diff) | |
download | django-7119f40c9881666b6f9b5cf7df09ee1d21cc8344.tar.gz |
Refs #33476 -- Refactored code to strictly match 88 characters line length.
Diffstat (limited to 'tests/m2m_through_regress')
-rw-r--r-- | tests/m2m_through_regress/tests.py | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/tests/m2m_through_regress/tests.py b/tests/m2m_through_regress/tests.py index 1c362657db..eae151546b 100644 --- a/tests/m2m_through_regress/tests.py +++ b/tests/m2m_through_regress/tests.py @@ -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"}}]', ) |