diff options
| -rw-r--r-- | tests/admin_views/tests.py | 25 | ||||
| -rw-r--r-- | tests/admin_widgets/tests.py | 11 |
2 files changed, 25 insertions, 11 deletions
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 5c5997fd9f..5602adafca 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -6246,6 +6246,7 @@ class SeleniumTests(AdminSeleniumTestCase): self.assertEqual(select2_display.text, "×\nnew section") def test_inline_uuid_pk_edit_with_popup(self): + from selenium.webdriver import ActionChains from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import Select @@ -6258,8 +6259,10 @@ class SeleniumTests(AdminSeleniumTestCase): "admin:admin_views_relatedwithuuidpkmodel_change", args=(related_with_parent.id,), ) - self.selenium.get(self.live_server_url + change_url) - self.selenium.find_element(By.ID, "change_id_parent").click() + with self.wait_page_loaded(): + self.selenium.get(self.live_server_url + change_url) + change_parent = self.selenium.find_element(By.ID, "change_id_parent") + ActionChains(self.selenium).move_to_element(change_parent).click().perform() self.wait_for_and_switch_to_popup() self.selenium.find_element(By.XPATH, '//input[@value="Save"]').click() self.selenium.switch_to.window(self.selenium.window_handles[0]) @@ -6292,6 +6295,7 @@ class SeleniumTests(AdminSeleniumTestCase): self.assertEqual(select.first_selected_option.get_attribute("value"), uuid_id) def test_inline_uuid_pk_delete_with_popup(self): + from selenium.webdriver import ActionChains from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import Select @@ -6304,8 +6308,10 @@ class SeleniumTests(AdminSeleniumTestCase): "admin:admin_views_relatedwithuuidpkmodel_change", args=(related_with_parent.id,), ) - self.selenium.get(self.live_server_url + change_url) - self.selenium.find_element(By.ID, "delete_id_parent").click() + with self.wait_page_loaded(): + self.selenium.get(self.live_server_url + change_url) + delete_parent = self.selenium.find_element(By.ID, "delete_id_parent") + ActionChains(self.selenium).move_to_element(delete_parent).click().perform() self.wait_for_and_switch_to_popup() self.selenium.find_element(By.XPATH, '//input[@value="Yes, I’m sure"]').click() self.selenium.switch_to.window(self.selenium.window_handles[0]) @@ -6316,6 +6322,7 @@ class SeleniumTests(AdminSeleniumTestCase): def test_inline_with_popup_cancel_delete(self): """Clicking ""No, take me back" on a delete popup closes the window.""" + from selenium.webdriver import ActionChains from selenium.webdriver.common.by import By parent = ParentWithUUIDPK.objects.create(title="test") @@ -6327,8 +6334,10 @@ class SeleniumTests(AdminSeleniumTestCase): "admin:admin_views_relatedwithuuidpkmodel_change", args=(related_with_parent.id,), ) - self.selenium.get(self.live_server_url + change_url) - self.selenium.find_element(By.ID, "delete_id_parent").click() + with self.wait_page_loaded(): + self.selenium.get(self.live_server_url + change_url) + delete_parent = self.selenium.find_element(By.ID, "delete_id_parent") + ActionChains(self.selenium).move_to_element(delete_parent).click().perform() self.wait_for_and_switch_to_popup() self.selenium.find_element(By.XPATH, '//a[text()="No, take me back"]').click() self.selenium.switch_to.window(self.selenium.window_handles[0]) @@ -6519,6 +6528,7 @@ class SeleniumTests(AdminSeleniumTestCase): self.selenium.set_window_size(current_size["width"], current_size["height"]) def test_updating_related_objects_updates_fk_selects_except_autocompletes(self): + from selenium.webdriver import ActionChains from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import Select @@ -6580,7 +6590,8 @@ class SeleniumTests(AdminSeleniumTestCase): ) # Add new Country from the living_country select. - self.selenium.find_element(By.ID, f"add_{living_country_select_id}").click() + element = self.selenium.find_element(By.ID, f"add_{living_country_select_id}") + ActionChains(self.selenium).move_to_element(element).click(element).perform() self.wait_for_and_switch_to_popup() self.selenium.find_element(By.ID, "id_name").send_keys("Spain") continent_select = Select( diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 80bb6233ab..75c546bcbf 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -1713,13 +1713,15 @@ class AdminRawIdWidgetSeleniumTests(AdminWidgetSeleniumTestCase): class RelatedFieldWidgetSeleniumTests(AdminWidgetSeleniumTestCase): def test_ForeignKey_using_to_field(self): + from selenium.webdriver import ActionChains from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import Select self.admin_login(username="super", password="secret", login_url="/") - self.selenium.get( - self.live_server_url + reverse("admin:admin_widgets_profile_add") - ) + with self.wait_page_loaded(): + self.selenium.get( + self.live_server_url + reverse("admin:admin_widgets_profile_add") + ) main_window = self.selenium.current_window_handle # Click the Add User button to add new @@ -1765,7 +1767,8 @@ class RelatedFieldWidgetSeleniumTests(AdminWidgetSeleniumTestCase): By.CSS_SELECTOR, "#id_user option[value=changednewuser]" ) - self.selenium.find_element(By.ID, "view_id_user").click() + element = self.selenium.find_element(By.ID, "view_id_user") + ActionChains(self.selenium).move_to_element(element).click(element).perform() self.wait_for_value("#id_username", "changednewuser") self.selenium.back() |