diff options
| author | Tom Carrick <tom@carrick.eu> | 2023-03-23 12:53:06 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-03-28 05:35:28 +0200 |
| commit | 788f7b8100dbef050129bf5c1e0af47e7bc89b28 (patch) | |
| tree | ba7d2d001555e4612c266b4cd00ecad21f68184c /tests | |
| parent | ded3334af6de74214ba3f985e68749e3c47ffd16 (diff) | |
[4.2.x] Fixed #34383 -- Fixed layout of admin fieldsets with multiple fields on the same line.
Thanks Antonio Candido Nazareth junior for the report.
Regression in 96a598356a9ea8c2c05b22cadc12e256a3b295fd.
Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Backport of d687febce5868545f99974d2499a91f81a32fef5 from main
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/admin_inlines/tests.py | 12 | ||||
| -rw-r--r-- | tests/admin_views/tests.py | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index 2d76509515..0be8d665d1 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -353,13 +353,13 @@ class TestInline(TestDataMixin, TestCase): ) # The div containing the position field is hidden. self.assertInHTML( - '<div class="fieldBox field-position hidden">' + '<div class="flex-container fieldBox field-position hidden">' '<label class="inline">Position:</label>' '<div class="readonly">0</div></div>', response.rendered_content, ) self.assertInHTML( - '<div class="fieldBox field-position hidden">' + '<div class="flex-container fieldBox field-position hidden">' '<label class="inline">Position:</label>' '<div class="readonly">1</div></div>', response.rendered_content, @@ -382,14 +382,14 @@ class TestInline(TestDataMixin, TestCase): # The whole line containing position field is hidden. self.assertInHTML( '<div class="form-row hidden field-position">' - "<div><label>Position:</label>" - '<div class="readonly">0</div></div></div>', + '<div><div class="flex-container"><label>Position:</label>' + '<div class="readonly">0</div></div></div></div>', response.rendered_content, ) self.assertInHTML( '<div class="form-row hidden field-position">' - "<div><label>Position:</label>" - '<div class="readonly">1</div></div></div>', + '<div><div class="flex-container"><label>Position:</label>' + '<div class="readonly">1</div></div></div></div>', response.rendered_content, ) diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 6bda6a2a7d..9c20ce2e2e 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -8076,11 +8076,13 @@ class TestLabelVisibility(TestCase): self.assert_field_visible(response, "second") def assert_field_visible(self, response, field_name): - self.assertContains(response, '<div class="fieldBox field-%s">' % field_name) + self.assertContains( + response, f'<div class="flex-container fieldBox field-{field_name}">' + ) def assert_field_hidden(self, response, field_name): self.assertContains( - response, '<div class="fieldBox field-%s hidden">' % field_name + response, f'<div class="flex-container fieldBox field-{field_name} hidden">' ) def assert_fieldline_visible(self, response): |