Retry clicking on delete confirmation popup

owncloud · Nov 11, 2019 · 0c5ad8b · 0c5ad8b
1 parent 8cc4dba
commit 0c5ad8b
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 21 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,69 @@ 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
-        )
-        .click('@deleteFileConfirmationBtn')
-        .waitForCSSPropertyEquals(
-          {
-            selector: this.elements.deleteFileConfirmationDialog.selector,
-            locateStrategy: this.elements.deleteFileConfirmationBtn.locateStrategy,
-            property: 'display',
-            value: 'none'
-          }
+          'css selector'
         )
-        .waitForOutstandingAjaxCalls()
+
+      const clickAction = function () {
+        return this.initAjaxCounters().click('@deleteFileConfirmationBtn')
+          .waitForOutstandingAjaxCalls()
+          .waitForElementNotVisible(
+            this.elements.deleteFileConfirmationDialog.selector,
+            this.api.globals.waitForConditionTimeout,
+            this.api.globals.waitForConditionPollInterval,
+            false,
+            function () {
+              console.log('waited for popup to disappear.')
+            }
+          )
+      }.bind(this)
+      await clickAction()
+
+      let isPopupVisible = false
+
+      /* issue: https://github.com/owncloud/phoenix/issues/1728
+         Clicking "OK" button on deletion confirmation dialog does not
+         disappear some of the times.
+
+         Why not just wait and click again later?
+         Some of the times, the "click" works and the popup starts
+         disappearing, but hasn't yet. So, it requires us to wait for
+         popup to disappear for quite a while and then, again recheck
+         if it's visible again. And, if it is, then only re-click.
+
+         We have `waitForCSSPropertyEquals` below that should check if clicking
+         once or twice really worked.
+
+         TODO: Investigate further why the "click" is not working
+      */
+      await this.isVisible(
+        {
+          selector: this.elements.deleteFileConfirmationDialog.selector,
+          locateStrategy: this.elements.deleteFileConfirmationDialog.locateStrategy,
+          suppressNotFoundErrors: true
+        },
+        ({ value }) => { isPopupVisible = value }
+      )
+      if (isPopupVisible === true) {
+        console.log('Retrying again. Popup did not disappear.')
+        await clickAction()
+      }
+
+      return this.waitForCSSPropertyEquals(
+        {
+          selector: this.elements.deleteFileConfirmationDialog.selector,
+          locateStrategy: this.elements.deleteFileConfirmationBtn.locateStrategy,
+          property: 'display',
+          value: 'none'
+        }
+      )
         .useCss()
     },
     /**

diff --git a/tests/acceptance/setup-drone.js b/tests/acceptance/setup-drone.js
@@ -1,7 +1,7 @@
 import { setDefaultTimeout, After, Before } from 'cucumber'
 import { createSession, closeSession, client } from 'nightwatch-api'
 
-setDefaultTimeout(120000)
+setDefaultTimeout(180000)
 
 Before(async () => {
   await createSession({ env: 'drone' })

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()