From b97155add3c8a0b7c3de2e350ee0e122b57908e5 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 12 Nov 2020 20:48:29 -0500 Subject: [PATCH] Fix toolbox filters integration tests. --- lib/galaxy/selenium/navigation.yml | 3 +++ test/integration_selenium/test_toolbox_filters.py | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/selenium/navigation.yml b/lib/galaxy/selenium/navigation.yml index 0c845a9cba7..d977a78e738 100644 --- a/lib/galaxy/selenium/navigation.yml +++ b/lib/galaxy/selenium/navigation.yml @@ -78,6 +78,9 @@ preferences: toolbox_filters: selectors: + input: + type: xpath + selector: "//span[contains(. ,'${description}')]/../div/div[@class=\"custom-control\"]" submit: '#submit' change_user_email: diff --git a/test/integration_selenium/test_toolbox_filters.py b/test/integration_selenium/test_toolbox_filters.py index 212da73f7e2..11557783cf8 100644 --- a/test/integration_selenium/test_toolbox_filters.py +++ b/test/integration_selenium/test_toolbox_filters.py @@ -31,11 +31,13 @@ class ToolboxFiltersSeleniumIntegrationTestCase(SeleniumIntegrationTestCase): self.navigate_to_user_preferences() self.components.preferences.toolbox_filters.wait_for_and_click() self.sleep_for(self.wait_types.UX_RENDER) + self.screenshot("toolbox_filters_landing") sibling_text = 'This tool filter will disable the Test Section section.' - # This is the least terrible way I've found to get the right element. - filter_upload = self.driver.find_element_by_xpath("//span[contains(. ,'%s')]/../div//label" % sibling_text) + component = self.components.toolbox_filters.input(description=sibling_text) + filter_upload = component.wait_for_visible() self.action_chains().move_to_element(filter_upload).click().perform() self.sleep_for(self.wait_types.UX_RENDER) + self.screenshot("toolbox_filters_swapped") self.components.toolbox_filters.submit.wait_for_and_click() self.sleep_for(self.wait_types.UX_RENDER) self.home()