From ab27741959a8ef08cf1bb9314959db8d1f3329b2 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 26 Jan 2023 10:33:28 -0500 Subject: [PATCH] Decorate more UI tests that require fresh histories. Based on tests against usegalaxy.org. --- lib/galaxy_test/selenium/test_collection_builders.py | 7 +++++++ lib/galaxy_test/selenium/test_collection_edit.py | 3 +++ lib/galaxy_test/selenium/test_dataset_metadata_download.py | 2 ++ lib/galaxy_test/selenium/test_history_dataset_state.py | 5 +++++ lib/galaxy_test/selenium/test_history_multi_view.py | 2 ++ 5 files changed, 19 insertions(+) diff --git a/lib/galaxy_test/selenium/test_collection_builders.py b/lib/galaxy_test/selenium/test_collection_builders.py index 21f3c492d37..25b6d0afa0f 100644 --- a/lib/galaxy_test/selenium/test_collection_builders.py +++ b/lib/galaxy_test/selenium/test_collection_builders.py @@ -1,4 +1,5 @@ from .framework import ( + managed_history, selenium_test, SeleniumTestCase, ) @@ -9,6 +10,7 @@ class TestCollectionBuilders(SeleniumTestCase): ensure_registered = True @selenium_test + @managed_history def test_build_list_simple_hidden(self): self.perform_upload(self.get_filename("1.fasta")) self._wait_for_and_select([1]) @@ -19,6 +21,7 @@ class TestCollectionBuilders(SeleniumTestCase): self._wait_for_hid_visible(2) @selenium_test + @managed_history def test_build_list_and_show_items(self): self.perform_upload(self.get_filename("1.fasta")) self._wait_for_and_select([1]) @@ -32,6 +35,7 @@ class TestCollectionBuilders(SeleniumTestCase): self._wait_for_hid_visible(3) @selenium_test + @managed_history def test_build_pair_simple_hidden(self): self.perform_upload(self.get_filename("1.tabular")) self.perform_upload(self.get_filename("2.tabular")) @@ -43,6 +47,7 @@ class TestCollectionBuilders(SeleniumTestCase): self._wait_for_hid_visible(3) @selenium_test + @managed_history def test_build_paired_list_simple(self): self.perform_upload(self.get_filename("1.tabular")) self.perform_upload(self.get_filename("2.tabular")) @@ -61,6 +66,7 @@ class TestCollectionBuilders(SeleniumTestCase): self._wait_for_hid_visible(2) @selenium_test + @managed_history def test_build_paired_list_show_original(self): self.perform_upload(self.get_filename("1.tabular")) self.perform_upload(self.get_filename("2.tabular")) @@ -85,6 +91,7 @@ class TestCollectionBuilders(SeleniumTestCase): self._wait_for_hid_visible(4) @selenium_test + @managed_history def test_build_simple_list_via_rules_hidden(self): self.perform_upload(self.get_filename("1.fasta")) self._wait_for_and_select([1]) diff --git a/lib/galaxy_test/selenium/test_collection_edit.py b/lib/galaxy_test/selenium/test_collection_edit.py index 279724d97b9..73148a36816 100644 --- a/lib/galaxy_test/selenium/test_collection_edit.py +++ b/lib/galaxy_test/selenium/test_collection_edit.py @@ -1,4 +1,5 @@ from .framework import ( + managed_history, selenium_test, SeleniumTestCase, ) @@ -9,6 +10,7 @@ class TestCollectionEdit(SeleniumTestCase): ensure_registered = True @selenium_test + @managed_history def test_change_dbkey_simple_list(self): self.create_simple_list_collection() self.open_collection_edit_view() @@ -23,6 +25,7 @@ class TestCollectionEdit(SeleniumTestCase): self.check_current_data_value(dataNew) @selenium_test + @managed_history def test_change_datatype_simple_list(self): self.create_simple_list_collection_txt() self.open_collection_edit_view() diff --git a/lib/galaxy_test/selenium/test_dataset_metadata_download.py b/lib/galaxy_test/selenium/test_dataset_metadata_download.py index 3df1e638dce..0a36a93078f 100644 --- a/lib/galaxy_test/selenium/test_dataset_metadata_download.py +++ b/lib/galaxy_test/selenium/test_dataset_metadata_download.py @@ -1,4 +1,5 @@ from .framework import ( + managed_history, selenium_test, SeleniumTestCase, UsesHistoryItemAssertions, @@ -11,6 +12,7 @@ class TestHistoryDatasetState(SeleniumTestCase, UsesHistoryItemAssertions): ensure_registered = True @selenium_test + @managed_history def test_dataset_metadata_download(self): self._prepare_dataset() item = self.history_panel_item_component(hid=FIRST_HID) diff --git a/lib/galaxy_test/selenium/test_history_dataset_state.py b/lib/galaxy_test/selenium/test_history_dataset_state.py index e4b059ecff5..eae0342fc4f 100644 --- a/lib/galaxy_test/selenium/test_history_dataset_state.py +++ b/lib/galaxy_test/selenium/test_history_dataset_state.py @@ -4,6 +4,7 @@ from galaxy.model.unittest_utils.store_fixtures import ( TEST_SOURCE_URI, ) from .framework import ( + managed_history, selenium_test, SeleniumTestCase, UsesHistoryItemAssertions, @@ -26,6 +27,7 @@ class TestHistoryDatasetState(SeleniumTestCase, UsesHistoryItemAssertions): ensure_registered = True @selenium_test + @managed_history def test_dataset_state(self): self._prepare_dataset() self.history_panel_item_body_component(FIRST_HID, wait=True) @@ -40,6 +42,7 @@ class TestHistoryDatasetState(SeleniumTestCase, UsesHistoryItemAssertions): self.screenshot("dataset_details_ok") @selenium_test + @managed_history def test_dataset_change_dbkey(self): item = self._prepare_dataset() self.assert_item_dbkey_displayed_as(FIRST_HID, "?") @@ -57,6 +60,7 @@ class TestHistoryDatasetState(SeleniumTestCase, UsesHistoryItemAssertions): self.assert_item_dbkey_displayed_as(FIRST_HID, "apiMel3") @selenium_test + @managed_history def test_dataset_state_discarded(self): self.history_panel_create_new() history_id = self.current_history_id() @@ -77,6 +81,7 @@ class TestHistoryDatasetState(SeleniumTestCase, UsesHistoryItemAssertions): self.screenshot("dataset_details_discarded") @selenium_test + @managed_history def test_dataset_state_deferred(self): self.history_panel_create_new() history_id = self.current_history_id() diff --git a/lib/galaxy_test/selenium/test_history_multi_view.py b/lib/galaxy_test/selenium/test_history_multi_view.py index 785c2c84f28..03db2c2c418 100644 --- a/lib/galaxy_test/selenium/test_history_multi_view.py +++ b/lib/galaxy_test/selenium/test_history_multi_view.py @@ -1,4 +1,5 @@ from .framework import ( + managed_history, selenium_test, SeleniumTestCase, ) @@ -22,6 +23,7 @@ class TestHistoryMultiView(SeleniumTestCase): self.screenshot("multi_history_collection") @selenium_test + @managed_history def test_list_list_display(self): history_id = self.current_history_id() method = self.dataset_collection_populator.create_list_of_list_in_history(history_id, wait=True).json