From 1812395c16d84ee21c223a9e63aaf8f8bc42cbe6 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sat, 23 Dec 2023 17:18:11 +0300
Subject: [PATCH] Adjust selenium tests

---
 client/src/components/Grid/GridList.vue    | 8 +-------
 client/src/utils/navigation/navigation.yml | 4 ++--
 lib/galaxy/selenium/navigates_galaxy.py    | 5 ++---
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index ad088d5adf19..2117bd4244d7 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -300,13 +300,7 @@ watch(operationMessage, () => {
         </table>
         <div class="flex-grow-1 h-100" />
         <div v-if="isAvailable" class="grid-footer d-flex justify-content-center pt-3">
-            <BPagination
-                v-model="currentPage"
-                :total-rows="totalRows"
-                :per-page="limit"
-                class="m-0"
-                size="sm"
-                aria-controls="grid-table" />
+            <BPagination v-model="currentPage" :total-rows="totalRows" :per-page="limit" class="m-0" size="sm" />
         </div>
     </div>
 </template>
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 344c8fcedf4c..d360afb14971 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -430,8 +430,8 @@ collection_builders:
     name: "input.collection-name"
 
 histories:
-  labels:
-    import_button: 'Import history'
+  selectors:
+    import_button: '[data-description="grid action import new history"]'
   sharing:
     selectors:
       unshare_user_button: '.share_with_view .multiselect__tag-icon'
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 246955f8fc50..148524e2b6c7 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -1706,12 +1706,11 @@ def histories_click_advanced_search(self):
     def histories_get_history_names(self):
         self.sleep_for(self.wait_types.UX_RENDER)
         names = []
-        grid = self.wait_for_selector("#grid-table-body")
+        grid = self.wait_for_selector("#histories-grid")
         for row in grid.find_elements(By.TAG_NAME, "tr"):
             td = row.find_elements(By.TAG_NAME, "td")
             name = td[1].text if td[0].text == "" else td[0].text
-            if name != "No items" and not name.startswith("No matching entries found"):
-                names.append(name)
+            names.append(name)
         return names
 
     @edit_details