Rebase into paired/unpaired...

galaxyproject · Feb 6, 2025 · 13859bd · 13859bd
1 parent f726dac
commit 13859bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/lib/galaxy_test/selenium/test_collection_builders.py b/lib/galaxy_test/selenium/test_collection_builders.py
@@ -64,14 +64,8 @@ def test_build_paired_list_manual_matched(self):
         )
         self._wait_for_and_select([1, 2])
         self.history_panel_build_list_of_pairs()
+        self.collection_builder_pair_rows(0, 1)
         row0 = self.components.collection_builders.list_wizard.row._(index=0)
-        row1 = self.components.collection_builders.list_wizard.row._(index=1)
-
-        row0.unlink_button.assert_absent()
-
-        row0.link_button.wait_for_and_click()
-        row1.link_button.wait_for_and_click()
-
         row0.unlink_button.wait_for_present()
         row0.link_button.assert_absent()
 
@@ -98,14 +92,8 @@ def test_build_paired_list_show_original(self):
         self._wait_for_and_select([1, 2])
         self.history_panel_build_list_of_pairs()
 
+        self.collection_builder_pair_rows(0, 1)
         row0 = self.components.collection_builders.list_wizard.row._(index=0)
-        row1 = self.components.collection_builders.list_wizard.row._(index=1)
-
-        row0.unlink_button.assert_absent()
-
-        row0.link_button.wait_for_and_click()
-        row1.link_button.wait_for_and_click()
-
         row0.unlink_button.wait_for_present()
         row0.link_button.assert_absent()
 

diff --git a/lib/galaxy_test/selenium/test_library_to_collections.py b/lib/galaxy_test/selenium/test_library_to_collections.py
@@ -79,9 +79,7 @@ def list_of_pairs_export(self, is_new_history=False):
         ).wait_for_and_click()
         self.screenshot(f"test_export_pairs_list={is_new_history}")
         self.components.libraries.folder.add_to_history_as_collection.wait_for_and_click()
-        self.components.libraries.folder.clear_filters.wait_for_and_click()
-        self.collection_builder_click_paired_item("forward", 0)
-        self.collection_builder_click_paired_item("reverse", 1)
+        self.collection_builder_pair_rows(0, 1)
         self.components.libraries.folder.export_to_history_collection_name.wait_for_and_send_keys(
             self._get_random_name()
         )