From c76c588ed1c2e336f65b9b930a08cae7fb8f2957 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 11 May 2017 09:35:14 -0400 Subject: [PATCH] Fix Selenium test cases for JavaScript-izing workflow management. --- test/galaxy_selenium/navigates_galaxy.py | 9 ++++----- test/selenium_tests/test_workflow_management.py | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/galaxy_selenium/navigates_galaxy.py b/test/galaxy_selenium/navigates_galaxy.py index 97e1ac16688..3260537b0eb 100644 --- a/test/galaxy_selenium/navigates_galaxy.py +++ b/test/galaxy_selenium/navigates_galaxy.py @@ -394,17 +394,16 @@ class NavigatesGalaxy(HasDriver): self.click_masthead_workflow() def workflow_index_table_elements(self): - self.wait_for_selector_visible(".manage-table tbody") - table_elements = self.driver.find_elements_by_css_selector(".manage-table tbody > tr") - # drop header - return table_elements[1:] + self.wait_for_selector_visible("tbody.workflow-search") + table_elements = self.driver.find_elements_by_css_selector("tbody.workflow-search > tr") + return table_elements def workflow_index_click_option(self, option_title, workflow_index=0): table_elements = self.workflow_index_table_elements() workflow_row = table_elements[workflow_index] workflow_button = workflow_row.find_element_by_css_selector(".menubutton") workflow_button.click() - menu_element = self.wait_for_selector_visible(".popmenu-wrapper .dropdown-menu") + menu_element = self.wait_for_selector_visible("ul.action-dpd") menu_options = menu_element.find_elements_by_css_selector("li a") found_option = False for menu_option in menu_options: diff --git a/test/selenium_tests/test_workflow_management.py b/test/selenium_tests/test_workflow_management.py index 6f26ffa6ca3..f4d4369a066 100644 --- a/test/selenium_tests/test_workflow_management.py +++ b/test/selenium_tests/test_workflow_management.py @@ -45,7 +45,8 @@ class WorkflowManagementTestCase(SeleniumTestCase): assert 'CoolNewName' in renamed_workflow_button.text, renamed_workflow_button.text def _workflow_import_from_url(self): - self.click_selector(self.test_data["selectors"]["workflows"]["import_button"]) + element = self.wait_for_selector_clickable(self.test_data["selectors"]["workflows"]["import_button"]) + element.click() url = "https://raw.githubusercontent.com/galaxyproject/galaxy/dev/test/base/data/test_workflow_1.ga" form_element = self.driver.find_element_by_css_selector("#center form") url_element = form_element.find_element_by_css_selector("input[type='text']")