Fix message bar and logout tests

owncloud · Dec 12, 2019 · b7efbdc · b7efbdc
1 parent 221082d
commit b7efbdc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/Phoenix.vue b/src/Phoenix.vue
@@ -6,7 +6,7 @@
         <router-view name="fullscreen"></router-view>
       </template>
       <template v-else>
-        <message-bar />
+        <message-bar :active-messages="activeMessages" @deleteMessage="$_deleteMessage" />
         <top-bar :applicationsList="$_applicationsList" :activeNotifications="activeNotifications" :user-id="user.id" :user-display-name="user.displayname" :hasAppNavigation="!!appNavigationEntries.length" @toggleAppNavigation="$_toggleAppNavigation(!appNavigationVisible)"></top-bar>
         <side-menu :visible="appNavigationVisible" :entries="appNavigationEntries" @closed="$_toggleAppNavigation(false)"></side-menu>
         <main id="main">
@@ -69,7 +69,7 @@ export default {
   },
   computed: {
     ...mapState(['route', 'user']),
-    ...mapGetters(['configuration', 'activeNotifications']),
+    ...mapGetters(['configuration', 'activeNotifications', 'activeMessages']),
     $_applicationsList () {
       return this.configuration.applications
     },
@@ -95,7 +95,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['initAuth', 'fetchNotifications']),
+    ...mapActions(['initAuth', 'fetchNotifications', 'deleteMessage']),
     $_toggleAppNavigation (state) {
       this.appNavigationVisible = state
     },
@@ -104,6 +104,9 @@ export default {
         console.error('Error while loading notifications: ', error)
         clearInterval(this.$_notificationsInterval)
       })
+    },
+    $_deleteMessage (item) {
+      this.deleteMessage(item)
     }
   },
   watch: {

diff --git a/src/components/UserMenu.vue b/src/components/UserMenu.vue
@@ -14,7 +14,7 @@
         <span v-if="userEmail">{{ userEmail }}</span>
         <router-link to="/account" target="_blank"><translate>Manage your account</translate></router-link>
         <br/>
-        <oc-button type="a" @click="logout()"><translate>Log out</translate></oc-button>
+        <oc-button id="logoutMenuItem" type="a" @click="logout()"><translate>Log out</translate></oc-button>
       </div>
       <div class="uk-card-footer uk-flex uk-flex-middle uk-flex-column">
         <span>Version: {{appVersion.version}}-{{appVersion.hash}} ({{appVersion.buildDate}})</span>

diff --git a/tests/acceptance/helpers/loginHelper.js b/tests/acceptance/helpers/loginHelper.js
@@ -43,8 +43,8 @@ module.exports = {
     const phoenixPage = client.page.phoenixPage()
     return phoenixPage
       .navigate()
-      .waitForElementVisible('@menuButton')
-      .click('@menuButton')
+      .waitForElementVisible('@userMenuButton')
+      .click('@userMenuButton')
       .waitForElementVisible('@logoutMenuItem')
       .waitForAnimationToFinish()
       .click('@logoutMenuItem')

diff --git a/tests/acceptance/pageObjects/phoenixPage.js b/tests/acceptance/pageObjects/phoenixPage.js
@@ -195,6 +195,9 @@ module.exports = {
     searchLoadingIndicator: {
       selector: '.oc-app-bar .uk-spinner'
     },
+    userMenuButton: {
+      selector: '#_userMenuButton'
+    },
     menuButton: {
       selector: '//button[@aria-label="Menu"]',
       locateStrategy: 'xpath'