diff options
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) |