diff options
| author | Carlton Gibson <carlton@noumenal.es> | 2021-09-21 19:58:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-21 19:58:00 +0200 |
| commit | b0ed619303d2fb723330ca9efa3acf23d49f1d19 (patch) | |
| tree | b54ecb8679ae882d2f89573cc53694a044e8da58 /tests/admin_changelist | |
| parent | 7d909b2282c91c5bc5204dd160412e90fa86d624 (diff) | |
| download | django-b0ed619303d2fb723330ca9efa3acf23d49f1d19.tar.gz | |
Fixed #33083 -- Fixed selecting all items in the admin changelist when actions are both top and bottom.
Thanks Benjamin Locher for the report.
Regression in 30e59705fc3e3e9e8370b965af794ad6173bf92b.
Diffstat (limited to 'tests/admin_changelist')
| -rw-r--r-- | tests/admin_changelist/admin.py | 1 | ||||
| -rw-r--r-- | tests/admin_changelist/tests.py | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/tests/admin_changelist/admin.py b/tests/admin_changelist/admin.py index 0397e8557a..f8051f64fa 100644 --- a/tests/admin_changelist/admin.py +++ b/tests/admin_changelist/admin.py @@ -134,6 +134,7 @@ class NoListDisplayLinksParentAdmin(admin.ModelAdmin): list_display_links = None list_display = ['name'] list_editable = ['name'] + actions_on_bottom = True site.register(Parent, NoListDisplayLinksParentAdmin) diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index e0486b37f8..7a567ebc10 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -1481,12 +1481,13 @@ class SeleniumTests(AdminSeleniumTestCase): question = self.selenium.find_element_by_css_selector('.actions > .question') clear = self.selenium.find_element_by_css_selector('.actions > .clear') select_all = self.selenium.find_element_by_id('action-toggle') - select_across = self.selenium.find_element_by_name('select_across') + select_across = self.selenium.find_elements_by_name('select_across') self.assertIs(question.is_displayed(), False) self.assertIs(clear.is_displayed(), False) self.assertIs(select_all.get_property('checked'), False) - self.assertEqual(select_across.get_property('value'), '0') + for hidden_input in select_across: + self.assertEqual(hidden_input.get_property('value'), '0') self.assertIs(selection_indicator.is_displayed(), True) self.assertEqual(selection_indicator.text, '0 of 100 selected') self.assertIs(select_all_indicator.is_displayed(), False) @@ -1495,7 +1496,8 @@ class SeleniumTests(AdminSeleniumTestCase): self.assertIs(question.is_displayed(), True) self.assertIs(clear.is_displayed(), False) self.assertIs(select_all.get_property('checked'), True) - self.assertEqual(select_across.get_property('value'), '0') + for hidden_input in select_across: + self.assertEqual(hidden_input.get_property('value'), '0') self.assertIs(selection_indicator.is_displayed(), True) self.assertEqual(selection_indicator.text, '100 of 100 selected') self.assertIs(select_all_indicator.is_displayed(), False) @@ -1504,7 +1506,8 @@ class SeleniumTests(AdminSeleniumTestCase): self.assertIs(question.is_displayed(), False) self.assertIs(clear.is_displayed(), True) self.assertIs(select_all.get_property('checked'), True) - self.assertEqual(select_across.get_property('value'), '1') + for hidden_input in select_across: + self.assertEqual(hidden_input.get_property('value'), '1') self.assertIs(selection_indicator.is_displayed(), False) self.assertIs(select_all_indicator.is_displayed(), True) @@ -1512,7 +1515,8 @@ class SeleniumTests(AdminSeleniumTestCase): self.assertIs(question.is_displayed(), False) self.assertIs(clear.is_displayed(), False) self.assertIs(select_all.get_property('checked'), False) - self.assertEqual(select_across.get_property('value'), '0') + for hidden_input in select_across: + self.assertEqual(hidden_input.get_property('value'), '0') self.assertIs(selection_indicator.is_displayed(), True) self.assertEqual(selection_indicator.text, '0 of 100 selected') self.assertIs(select_all_indicator.is_displayed(), False) |