Retry clicking on delete confirmation popup

owncloud · Nov 8, 2019 · bb9a83c · bb9a83c
1 parent 8cc4dba
commit bb9a83c
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 19 deletions.
diff --git a/tests/acceptance/customCommands/waitForElementEnabled.js b/tests/acceptance/customCommands/waitForElementEnabled.js
@@ -17,13 +17,14 @@
 module.exports.command = function (
   selector, locateStrategy = 'css selector', timeout = this.globals.waitForConditionTimeout
 ) {
+  let self = this
   if (locateStrategy === 'xpath') {
-    this.useXpath()
+    self = this.useXpath()
   } else if (locateStrategy === 'css selector') {
-    this.useCss()
+    self = this.useCss()
   } else {
-    this.assert.fail('invalid locateStrategy')
+    return this.assert.fail('invalid locateStrategy')
   }
-  this.expect.element(selector).enabled.before(timeout)
-  return this
+  self.expect.element(selector).enabled.before(timeout)
+  return self
 }
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -103,25 +103,56 @@ module.exports = {
      *
      * @param {string} fileName
      */
-    deleteFile: function (fileName) {
-      return this.initAjaxCounters()
+    deleteFile: async function (fileName) {
+      await this
         .waitForFileVisible(fileName)
         .useXpath()
         .performFileAction(fileName, 'delete')
         .waitForElementEnabled(
           this.elements.deleteFileConfirmationBtn.selector,
-          this.elements.deleteFileConfirmationBtn.locateStrategy
+          'css selector'
         )
-        .click('@deleteFileConfirmationBtn')
-        .waitForCSSPropertyEquals(
-          {
-            selector: this.elements.deleteFileConfirmationDialog.selector,
-            locateStrategy: this.elements.deleteFileConfirmationBtn.locateStrategy,
-            property: 'display',
-            value: 'none'
+
+      const clickAction = function () {
+        return this.initAjaxCounters().click('@deleteFileConfirmationBtn')
+          .waitForOutstandingAjaxCalls()
+          .waitForAnimationToFinish()
+          .waitForElementNotVisible(
+            this.elements.deleteFileConfirmationDialog.selector,
+            this.api.globals.waitForConditionTimeout,
+            this.api.globals.waitForConditionPollInterval,
+            false,
+            function (result) {
+              console.log('waited for popup to disappear.')
+            }
+          )
+      }.bind(this)
+      await clickAction()
+
+      await this.isVisible(
+        {
+          selector: this.elements.deleteFileConfirmationBtn.selector,
+          locateStrategy: 'css selector',
+          suppressNotFoundErrors: true
+        },
+        async function (result) {
+          console.log(result)
+          if (result.status < 0) {
+            console.log('Looks like the button was not clicked. Retrying ....')
+            await clickAction()
           }
-        )
-        .waitForOutstandingAjaxCalls()
+        }
+      )
+
+      return this.waitForCSSPropertyEquals(
+        {
+          selector: this.elements.deleteFileConfirmationDialog.selector,
+
+          locateStrategy: this.elements.deleteFileConfirmationBtn.locateStrategy,
+          property: 'display',
+          value: 'none'
+        }
+      )
         .useCss()
     },
     /**

diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
@@ -137,9 +137,9 @@ When('the user deletes file/folder {string} using the webUI', function (element)
   return client.page.FilesPageElement.filesList().deleteFile(element)
 })
 
-When('the user deletes the following elements using the webUI', function (table) {
+When('the user deletes the following elements using the webUI', async function (table) {
   for (const line of table.rows()) {
-    client.page.FilesPageElement.filesList().deleteFile(line[0])
+    await client.page.FilesPageElement.filesList().deleteFile(line[0])
     deletedElements.push(line[0])
   }
   return client.page.filesPage()