Check if collaborators quickAction is visible

owncloud · Jun 16, 2020 · fa0a463 · fa0a463
1 parent 507b37a
commit fa0a463
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/apps/files/src/components/FilesLists/QuickActions.vue b/apps/files/src/components/FilesLists/QuickActions.vue
@@ -34,7 +34,7 @@ export default {
   computed: {
     filteredActions() {
       return filterObject(this.actions, (key, value) => {
-        return value.displayed(this.item) === true
+        return value.displayed({ item: this.item, store: this.$store }) === true
       })
     }
   }

diff --git a/apps/files/src/quickActions.js b/apps/files/src/quickActions.js
@@ -53,8 +53,8 @@ function openNewCollaboratorsPanel(ctx) {
   })
 }
 
-function canShare(item) {
-  return item.canShare()
+function canShare(ctx) {
+  return ctx.store.state.user.capabilities.files_sharing.api_enabled && ctx.item.canShare()
 }
 
 export default {

diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -110,9 +110,22 @@ module.exports = {
      * @return {Promise<module.exports.commands>}
      */
     isSharingButtonPresent: async function(resource) {
-      await this.waitForFileVisible(resource)
-      await filesRow.openFileActionsMenu(resource).isSharingBtnPresent()
-      return this
+      const sharingBtnSelector = util.format(
+        filesRow.elements.quickAction.selector,
+        'collaborators'
+      )
+      const resourceRowSelector = this.getFileRowSelectorByFileName(resource)
+      let isPresent = true
+
+      await this.api.elements(
+        this.elements.shareButtonInFileRow.locateStrategy,
+        resourceRowSelector + sharingBtnSelector,
+        result => {
+          isPresent = result.value.length > 0
+        }
+      )
+
+      return isPresent
     },
     /**
      * @return {Promise<*>}

diff --git a/tests/acceptance/stepDefinitions/sharingContext.js b/tests/acceptance/stepDefinitions/sharingContext.js
@@ -682,9 +682,8 @@ Then('it should not be possible to share file/folder {string} using the webUI',
   const appSideBar = client.page.FilesPageElement.appSideBar()
   const filesList = client.page.FilesPageElement.filesList()
   // assumes current webUI state as no sidebar open for any resource
-  // TODO: Bring back when implementing collaborators quick action
-  // const state = await filesList.isSharingButtonPresent(resource)
-  // assert.ok(!state, `Error: Sharing button for resource ${resource} is not in disabled state`)
+  const state = await filesList.isSharingButtonPresent(resource)
+  assert.ok(!state, `Error: Sharing button for resource ${resource} is not in disabled state`)
   await filesList.openSideBar(resource)
   const sidebarLinkTabState = await appSideBar.isLinksTabPresentOnCurrentSidebar()
   assert.ok(!sidebarLinkTabState, `Error: Sidebar 'Links' tab for resource ${resource} is present`)