Merge pull request galaxyproject#22301 from mvdbeek/fix-flaky-tests

Fix flaky selenium tests ``test_refresh_preserves_state``, and``test_tool_discovery_landing``

Author: jmchilton

client/src/components/ToolsList/ToolsListTable.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { BAlert } from "bootstrap-vue";
 import { storeToRefs } from "pinia";
-import { watchEffect } from "vue";
+import { computed } from "vue";
 
 import { type Tool, useToolStore } from "@/stores/toolStore";
 
@@ -42,18 +42,15 @@ async function loadTools(offset: number, limit: number): Promise<{ items: Tool[]
     return { items, total: props.tools.length };
 }
 
-// Watch for changes in tools array to preload initial help data
-watchEffect(() => {
-    if (props.tools.length > 0) {
-        const initialItems = props.tools.slice(0, FETCH_LIMIT + PREFETCH_AHEAD);
-        Promise.all(initialItems.map((tool) => toolStore.fetchHelpForId(tool.id)));
-    }
-});
+// Force ScrollList remount when tools change (e.g. after search),
+// ensuring loadTools is called again to await help data for new results.
+const toolsKey = computed(() => `${props.tools.length}-${props.tools[0]?.id}`);
 </script>
 
 <template>
     <ScrollList
         ref="root"
+        :key="toolsKey"
         :loader="loadTools"
         :limit="FETCH_LIMIT"
         :item-key="(tool) => tool.id"

client/src/stores/toolStore.ts

@@ -116,7 +116,7 @@ export const useToolStore = defineStore("toolStore", () => {
     const toolsById = shallowRef<Record<string, Tool>>({});
     const toolResults = ref<Record<string, string[]>>({});
     const toolSections = ref<Record<string, Record<string, ToolPanelItem>>>({});
-    const fetchedHelpIds = ref<Set<string>>(new Set());
+    const fetchedHelpIds = ref<Map<string, Promise<void>>>(new Map());
     const helpDataCached = ref<Record<string, ToolHelpData>>({});
 
     const currentToolSections = computed(() => {
@@ -281,10 +281,15 @@ export const useToolStore = defineStore("toolStore", () => {
     }
 
     async function fetchHelpForId(toolId: string) {
-        try {
-            if (!helpDataCached.value[toolId] && !fetchedHelpIds.value.has(toolId)) {
-                fetchedHelpIds.value.add(toolId);
-
+        if (helpDataCached.value[toolId]) {
+            return;
+        }
+        const existing = fetchedHelpIds.value.get(toolId);
+        if (existing) {
+            return existing;
+        }
+        const promise = (async () => {
+            try {
                 const toolHelpData: ToolHelpData = {};
 
                 const { data } = (await axios.get(
@@ -300,11 +305,13 @@ export const useToolStore = defineStore("toolStore", () => {
                 }
 
                 Vue.set(helpDataCached.value, toolId, toolHelpData);
+            } catch (error) {
+                console.error("Error fetching help:", error);
+                fetchedHelpIds.value.delete(toolId); // Allow retrying on next request
             }
-        } catch (error) {
-            console.error("Error fetching help:", error);
-            fetchedHelpIds.value.delete(toolId); // Allow retrying on next request
-        }
+        })();
+        fetchedHelpIds.value.set(toolId, promise);
+        return promise;
     }
 
     async function initializePanel() {

lib/galaxy_test/selenium/test_history_panel.py

@@ -156,7 +156,6 @@ def clear_tags(self, expected_tags_size):
             close_btn.click()
             self.sleep_for(self.wait_types.UX_RENDER)
 
-    @selenium_only("Not yet migrated to support Playwright backend")
     @selenium_test
     def test_refresh_preserves_state(self):
         self.perform_upload(self.get_filename("1.txt"))
@@ -175,7 +174,7 @@ def test_refresh_preserves_state(self):
         assert self.history_panel_item_showing_details(hid=1)
 
         # Close the detailed display, refresh, and ensure they are still closed.
-        self.history_panel_click_item_title(hid=1, wait=False)
+        self.history_panel_click_item_title(hid=1, wait=True)
         assert not self.history_panel_item_showing_details(hid=1)
 
         self._refresh()

lib/galaxy_test/selenium/test_tool_discovery_view.py

@@ -16,7 +16,7 @@ class TestToolDiscoveryViewAnonymous(SeleniumTestCase):
     advanced search, and list vs grid view toggling.
     """
 
-    @transient_failure(issue=21225)
+    @transient_failure(issue=21225, potentially_fixed=True)
     @selenium_test
     def test_tool_discovery_landing(self):
         """Test navigation to the tool discovery view."""