Adjust selenium tests with regard to updated user dropdown

guerler · May 30, 2024 · b59ff35 · b59ff35
1 parent e7ddeb8
commit b59ff35
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/client/src/stores/activityStore.test.ts b/client/src/stores/activityStore.test.ts
@@ -12,6 +12,7 @@ jest.mock("./activitySetup", () => ({
             id: "a-id",
             mutable: false,
             optional: false,
+            panel: true,
             title: "a-title",
             to: null,
             tooltip: "a-tooltip",
@@ -28,6 +29,7 @@ const newActivities = [
         id: "a-id",
         mutable: false,
         optional: false,
+        panel: true,
         title: "a-title",
         to: "a-to-new",
         tooltip: "a-tooltip-new",
@@ -40,6 +42,7 @@ const newActivities = [
         id: "b-id",
         mutable: true,
         optional: false,
+        panel: true,
         title: "b-title-new",
         to: "b-to-new",
         tooltip: "b-tooltip-new",

diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
@@ -40,26 +40,24 @@ masthead:
   selectors:
     _: '#masthead'
 
-    # bootstrap-vue a tag doesn't work as link target, need to hit span inside
-    user: '#user.loggedin-only > a.nav-link > span'
-    register_or_login: '#user.loggedout-only > .nav-link'
-    logout: '#user.loggedin-only > .nav-link'
-    home: '#analysis'
     help: '#help'
-    login: '#user'
+    home: '#analysis'
     libraries: '#library'
-    window_manager: '#enable-window-manager'
-    workflow: '#workflow .nav-link'
-
-    username:
-      type: xpath
-      selector: '//a[contains(text(), "Signed in as")]'
-
+    login: '#user'
+    logout: '.dropdown-menu > li > a > .fa-sign-out-alt'
     logged_in_only: '.loggedin-only'
     logged_out_only: '.loggedout-only'
+    preferences: '.dropdown-menu > li > a > .fa-gear'
+    register_or_login: '#user.loggedout-only > .nav-link'
     storage_dashboard_link:
       selector: 'storage dashboard link'
       type: data-description
+    user: '#user.loggedin-only > a.nav-link > .fa'
+    username:
+      type: xpath
+      selector: '//a[contains(text(), "Signed in as")]'
+    window_manager: '#enable-window-manager'
+    workflow: '#workflow .nav-link'
 
 preferences:
   selectors:

diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
@@ -1247,8 +1247,8 @@ def navigate_to_histories_shared_with_me_page(self):
 
     def navigate_to_user_preferences(self):
         self.home()
-        self.components.preferences.activity.wait_for_and_click()
-        self.components.preferences.activity_expand.wait_for_and_click()
+        self.components.masthead.user.wait_for_and_click()
+        self.components.masthead.preferences.wait_for_and_click()
 
     def navigate_to_invocations(self):
         self.home()
@@ -1989,6 +1989,7 @@ def logout_if_needed(self):
 
     def logout(self):
         self.components.masthead.logged_in_only.wait_for_visible()
+        self.components.masthead.user.wait_for_and_click()
         self.components.masthead.logout.wait_for_and_click()
         try:
             self.components.masthead.logged_out_only.wait_for_visible()