From aa825d22aa8ec934fc4ec2a30f20fc821c8e3c0b Mon Sep 17 00:00:00 2001 From: John Chilton Date: Sat, 23 Sep 2017 18:34:19 -0400 Subject: [PATCH] Selenium - fix transient issue with saved histories test. --- test/galaxy_selenium/navigates_galaxy.py | 5 +++++ test/selenium_tests/test_saved_histories.py | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/test/galaxy_selenium/navigates_galaxy.py b/test/galaxy_selenium/navigates_galaxy.py index 5c5ae4a2d86..c238e23ab8a 100644 --- a/test/galaxy_selenium/navigates_galaxy.py +++ b/test/galaxy_selenium/navigates_galaxy.py @@ -659,6 +659,11 @@ class NavigatesGalaxy(HasDriver): menu_selector = self.test_data["historyOptions"]["selectors"]["menu"] return menu_selector + @retry_during_transitions + def histories_click_advanced_search(self): + search_selector = '#standard-search .advanced-search-toggle' + self.wait_for_and_click_selector(search_selector) + def history_panel_add_tags(self, tags): tag_icon_selector = self.test_data['historyPanel']['selectors']['history']['tagIcon'] tag_area_selector = self.test_data['historyPanel']['selectors']['history']['tagArea'] diff --git a/test/selenium_tests/test_saved_histories.py b/test/selenium_tests/test_saved_histories.py index 8bd65ec0348..eeed1d20b23 100644 --- a/test/selenium_tests/test_saved_histories.py +++ b/test/selenium_tests/test_saved_histories.py @@ -43,7 +43,7 @@ class SavedHistoriesTestCase(SharedStateSeleniumTestCase): self.navigate_to_saved_histories_page() - self.show_advanced_search() + self.histories_click_advanced_search() self.select_filter('sharing', 'published') time.sleep(1) @@ -80,7 +80,7 @@ class SavedHistoriesTestCase(SharedStateSeleniumTestCase): self.assert_histories_in_grid([self.history2_name], False) - self.show_advanced_search() + self.histories_click_advanced_search() self.select_filter('deleted', 'True') time.sleep(1) @@ -106,7 +106,7 @@ class SavedHistoriesTestCase(SharedStateSeleniumTestCase): self.assert_histories_in_grid([self.history4_name], False) - self.show_advanced_search() + self.histories_click_advanced_search() self.select_filter('deleted', 'True') self.assert_histories_in_grid([self.history4_name]) @@ -125,7 +125,7 @@ class SavedHistoriesTestCase(SharedStateSeleniumTestCase): self.assert_histories_in_grid([self.history2_name, self.history3_name], False) - self.show_advanced_search() + self.histories_click_advanced_search() self.select_filter('deleted', 'True') time.sleep(1) @@ -182,7 +182,7 @@ class SavedHistoriesTestCase(SharedStateSeleniumTestCase): self._login() self.navigate_to_saved_histories_page() - self.show_advanced_search() + self.histories_click_advanced_search() name_filter_selector = '#input-name-filter' tags_filter_selector = '#input-tags-filter' @@ -299,10 +299,6 @@ class SavedHistoriesTestCase(SharedStateSeleniumTestCase): self.click_history_option('Create New') self.history_panel_rename(name) - def show_advanced_search(self): - search_selector = '#standard-search .advanced-search-toggle' - self.wait_for_and_click_selector(search_selector) - def select_filter(self, filter_key, filter_value): filter_selector = 'a[filter_key="%s"][filter_val="%s"]' % \ (filter_key, filter_value)