From e132521255ca1349a556a337ee8e6b031bb1c382 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 27 Sep 2017 09:49:53 -0400 Subject: [PATCH] Selenium - bug fix for grabbing history name during transition. xref https://jenkins.galaxyproject.org/job/selenium/654/artifact/654-test-errors/test_history_switch2017092708211506514917/ --- test/galaxy_selenium/navigates_galaxy.py | 4 ++++ test/selenium_tests/test_history_panel.py | 9 +++------ test/selenium_tests/test_saved_histories.py | 3 +-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/galaxy_selenium/navigates_galaxy.py b/test/galaxy_selenium/navigates_galaxy.py index 71a77e711ac..a48b57d5aad 100644 --- a/test/galaxy_selenium/navigates_galaxy.py +++ b/test/galaxy_selenium/navigates_galaxy.py @@ -130,6 +130,10 @@ class NavigatesGalaxy(HasDriver): def history_panel_name_element(self): return self.wait_for_selector(self.history_panel_name_selector()) + @retry_during_transitions + def history_panel_name(self): + return self.history_panel_name_element().text + def current_history(self): history = self.api_get("histories")[0] return history diff --git a/test/selenium_tests/test_history_panel.py b/test/selenium_tests/test_history_panel.py index f1aae2d5026..42b989471ca 100644 --- a/test/selenium_tests/test_history_panel.py +++ b/test/selenium_tests/test_history_panel.py @@ -28,8 +28,7 @@ class HistoryPanelTestCase(SeleniumTestCase): editable_text_input_element.send_keys("New History Name") self.send_enter(editable_text_input_element) - name_element = self.history_panel_name_element() - assert "New History Name" in name_element.text + assert "New History Name" in self.history_panel_name() @selenium_test def test_history_rename_cancel_with_click(self): @@ -38,8 +37,7 @@ class HistoryPanelTestCase(SeleniumTestCase): editable_text_input_element.send_keys("New History Name") self.click_center() self.assert_selector_absent(self.history_panel_edit_title_input_selector()) - name_element = self.history_panel_name_element() - assert "New History Name" not in name_element.text + assert "New History Name" not in self.history_panel_name() @selenium_test def test_history_rename_cancel_with_escape(self): @@ -48,8 +46,7 @@ class HistoryPanelTestCase(SeleniumTestCase): editable_text_input_element.send_keys("New History Name") self.send_escape(editable_text_input_element) self.assert_selector_absent(self.history_panel_edit_title_input_selector()) - name_element = self.history_panel_name_element() - assert "New History Name" not in name_element.text + assert "New History Name" not in self.history_panel_name() @selenium_test def test_history_tags_and_annotations_buttons(self): diff --git a/test/selenium_tests/test_saved_histories.py b/test/selenium_tests/test_saved_histories.py index 6e3221c0db4..5dae8bb0706 100644 --- a/test/selenium_tests/test_saved_histories.py +++ b/test/selenium_tests/test_saved_histories.py @@ -25,8 +25,7 @@ class SavedHistoriesTestCase(SharedStateSeleniumTestCase): @retry_assertion_during_transitions def assert_history_name_switched(): - history_name = self.history_panel_name_element() - self.assertEqual(history_name.text, self.history2_name) + self.assertEqual(self.history_panel_name(), self.history2_name) assert_history_name_switched()