Add retry for share indicators

owncloud · Apr 21, 2021 · 4005761 · 4005761
1 parent 67b7a85
commit 4005761
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/.drone.star b/.drone.star
@@ -242,7 +242,7 @@ config = {
 					'webUITags',
 					'webUIWebdavLockProtection',
 					'webUIWebdavLocks',
-					],
+				],
 				'iPhone2': [
 					'webUIMoveFilesFolders',
 					'webUIResharing1',
@@ -272,6 +272,7 @@ config = {
 					'webUISharingInternalUsersToRootSharingIndicator',
 					'webUISharingInternalUsersExpireToRoot',
 					'webUISharingInternalUsersToRoot',
+					'webUISharingInternalUsersToRootBlacklisted',
 					'webUISharingPermissionsUsers',
 					'webUISharingPermissionToRoot',
 					'webUISharingPublicBasic',

diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -453,10 +453,11 @@ module.exports = {
         this.elements.shareIndicatorsInFileRow.locateStrategy,
         shareIndicatorsXpath,
         result => {
-          console.log(result)
           result.value.forEach(element => {
             this.api.elementIdAttribute(element.ELEMENT, 'class', attr => {
-              console.log(attr)
+              if (parseInt(attr.status) < 0) {
+                return
+              }
               if (attr.value.indexOf('uk-invisible') >= 0) {
                 return
               }
@@ -485,6 +486,30 @@ module.exports = {
       return indicators
     },
 
+    /**
+     *
+     * @param {string} fileName
+     * @param {boolean} sharingIndicatorExpectedToBeVisible
+     * @returns {Array} array of sharing indicator
+     */
+    getShareIndicatorsForResourceWithRetry: async function(
+      fileName,
+      sharingIndicatorExpectedToBeVisible
+    ) {
+      let indicators = await this.getShareIndicatorsForResource(
+        fileName,
+        sharingIndicatorExpectedToBeVisible
+      )
+      if (!indicators.length) {
+        console.log('Share indicators not found on first try, Retrying again')
+        indicators = await this.getShareIndicatorsForResource(
+          fileName,
+          sharingIndicatorExpectedToBeVisible
+        )
+      }
+      return indicators
+    },
+
     setSort: async function(column, isDesc = false) {
       const columnSelector = util.format(
         this.elements.filesTableHeaderColumn.selector,

diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
@@ -1110,7 +1110,7 @@ Then('the following resources should have share indicators on the webUI', async
   dataTable
 ) {
   for (const { fileName, expectedIndicators } of dataTable.hashes()) {
-    const indicatorsArray = await client.page.FilesPageElement.filesList().getShareIndicatorsForResource(
+    const indicatorsArray = await client.page.FilesPageElement.filesList().getShareIndicatorsForResourceWithRetry(
       fileName,
       true
     )