diff options
| author | Carlton Gibson <carlton@noumenal.es> | 2021-09-21 19:58:00 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-09-21 19:59:41 +0200 |
| commit | 6760f4fa251e9559a701a40da67680d2bb0a0dba (patch) | |
| tree | 879236dc82d873d5af9e1385061b15fd24031755 /tests | |
| parent | e235c7815aaf4066123fd54064e02004217891ac (diff) | |
[3.2.x] 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.
Backport of b0ed619303d2fb723330ca9efa3acf23d49f1d19 from main
Diffstat (limited to 'tests')
| -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 4f23296eca..34e84a06b6 100644 --- a/tests/admin_changelist/admin.py +++ b/tests/admin_changelist/admin.py @@ -133,6 +133,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 c53e401577..08fe636128 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -1444,12 +1444,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) @@ -1458,7 +1459,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) @@ -1467,7 +1469,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) @@ -1475,7 +1478,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) |