Check if the navigation is visible in tests

owncloud · May 11, 2020 · 80f432d · 80f432d
1 parent 00e9a5e
commit 80f432d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/src/Phoenix.vue b/src/Phoenix.vue
@@ -7,6 +7,7 @@
       </template>
       <div v-else key="core-content" class="uk-height-1-1 uk-flex uk-flex-row uk-flex-row">
         <oc-sidebar
+          class="oc-app-navigation"
           :logo-img="logoImage"
           :product-name="productName"
           :nav-items="navItems"

diff --git a/src/components/Top-Bar.vue b/src/components/Top-Bar.vue
@@ -5,7 +5,7 @@
   >
     <oc-button
       variation="raw"
-      class="uk-hidden@l"
+      class="oc-app-navigation-toggle uk-hidden@l"
       :aria-label="$gettext('Open navigation menu')"
       @click="toggleAppNavigationVisibility"
     >

diff --git a/tests/acceptance/pageObjects/phoenixPage.js b/tests/acceptance/pageObjects/phoenixPage.js
@@ -30,17 +30,31 @@ module.exports = {
     /**
      * @param {string} page
      */
-    navigateToUsingMenu: function(page) {
+    navigateToUsingMenu: async function(page) {
       const menuItemSelector = util.format(this.elements.menuItem.selector, page)
-      return this.waitForElementVisible('@menuButton')
-        .click('@menuButton')
-        .useXpath()
+      let isAppNavigationVisible = true
+
+      // Check if the navigation is visible
+      await this.api.element('@appNavigationHidden', result => {
+        if (result.status > -1) {
+          isAppNavigationVisible = false
+        }
+      })
+
+      // If app navigation is not visible, try to click on the menu button
+      if (!isAppNavigationVisible) {
+        this.click('@menuButton').waitForAnimationToFinish()
+      }
+
+      this.useXpath()
         .waitForElementVisible(menuItemSelector)
-        .waitForAnimationToFinish()
         .click(menuItemSelector)
         .api.page.FilesPageElement.filesList()
         .waitForElementPresent({ selector: '@filesListProgressBar', abortOnFailure: false }) // don't fail if we are too late
         .waitForElementNotPresent('@filesListProgressBar')
+        .useCss()
+
+      return this
     },
     markNotificationAsRead: function() {
       return this.waitForElementVisible('@notificationBell')
@@ -208,11 +222,10 @@ module.exports = {
       selector: '#_userMenuButton'
     },
     menuButton: {
-      selector: '//button[@aria-label="Menu"]',
-      locateStrategy: 'xpath'
+      selector: '.oc-app-navigation-toggle'
     },
     menuItem: {
-      selector: '//ul[contains(@class, "oc-main-menu")]/li/a[contains(text(),"%s")]',
+      selector: '//nav[contains(@class, "oc-sidebar-nav")]/ul/li/a[contains(text(),"%s")]',
       locateStrategy: 'xpath'
     },
     logoutMenuItem: {
@@ -240,6 +253,10 @@ module.exports = {
       selector:
         '//div[@id="oc-notification"]//h5[contains(text(),\'%s\')]/../div/button/span[.="Accept"]',
       locateStrategy: 'xpath'
+    },
+    appNavigationHidden: {
+      selector: '//div[contains(@class, "oc-app-navigation") and contains(@class, "uk-visible@l")]',
+      locateStrategy: 'xpath'
     }
   }
 }