diff --git a/test/galaxy_selenium/navigates_galaxy.py b/test/galaxy_selenium/navigates_galaxy.py index 082f83b29d5..fb98eb8a734 100644 --- a/test/galaxy_selenium/navigates_galaxy.py +++ b/test/galaxy_selenium/navigates_galaxy.py @@ -791,10 +791,6 @@ class NavigatesGalaxy(HasDriver): else: self.wait_for_selector_visible(details_selector) - def click_hda_title(self, hda_id, wait=False): - # TODO: Replace with calls to history_panel_click_item_title. - return self.history_panel_click_item_title(hda_id=hda_id, wait=wait) - def collection_builder_set_name(self, name): name_element = self.wait_for_selector_visible("input.collection-name") name_element.send_keys(name) diff --git a/test/selenium_tests/test_history_options.py b/test/selenium_tests/test_history_options.py index d4dad146da4..83b4dc5dff0 100644 --- a/test/selenium_tests/test_history_options.py +++ b/test/selenium_tests/test_history_options.py @@ -21,12 +21,13 @@ class HistoryOptionsTestCase(SeleniumTestCase): self.assert_selector_absent_or_hidden(menu_selector) - hda_id = self.latest_history_item()["id"] - self.click_hda_title(hda_id, wait=True) + hda = self.latest_history_item() + hid = hda["hid"] + self.history_panel_click_item_title(hid=hid, wait=True) - hda_body_selector = self.hda_body_selector(hda_id) + hda_body_selector = self.hda_body_selector(hda["id"]) self.wait_for_selector_visible(hda_body_selector) - self.click_hda_title(hda_id, wait=True) + self.history_panel_click_item_title(hid=hid, wait=True) self.assert_selector_absent_or_hidden_after_transitions(hda_body_selector) diff --git a/test/selenium_tests/test_history_panel.py b/test/selenium_tests/test_history_panel.py index 42b989471ca..39fe163fb08 100644 --- a/test/selenium_tests/test_history_panel.py +++ b/test/selenium_tests/test_history_panel.py @@ -92,7 +92,7 @@ class HistoryPanelTestCase(SeleniumTestCase): hda_body_selector = self.hda_body_selector(hda_id) self.assert_selector_absent_or_hidden(hda_body_selector) - self.click_hda_title(hda_id, wait=True) + self.history_panel_click_item_title(hda_id, wait=True) self.wait_for_selector_visible(hda_body_selector) self.history_panel_refresh_click() @@ -100,7 +100,7 @@ class HistoryPanelTestCase(SeleniumTestCase): title_selector = self.hda_div_selector(hda_id) self.wait_for_selector_visible(hda_body_selector) - self.click_hda_title(hda_id, wait=True) + self.history_panel_click_item_title(hda_id, wait=True) self.history_panel_refresh_click() self.wait_for_selector(title_selector)