Fix acceptance test selectors

tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature

@@ -74,7 +74,7 @@ Feature: files and folders can be deleted from the trashbin
       | name          |
       | lorem.txt     |
       | lorem-big.txt |
-    And the user batch deletes the marked files using the webUI
+    And the user batch deletes the market files permanently using the webUI
     Then file "lorem.txt" should be listed on the webUI
     And file "lorem-big.txt" should be listed on the webUI
     But file "data.zip" should not be listed on the webUI
@@ -88,7 +88,7 @@ Feature: files and folders can be deleted from the trashbin
       | name          |
       | lorem.txt     |
       | lorem-big.txt |
-    And the user batch deletes the marked files using the webUI
+    And the user batch deletes the market files permanently using the webUI
     Then file "lorem.txt" should be listed on the webUI
     And file "lorem-big.txt" should be listed on the webUI
     But folder "simple-folder" should be listed on the webUI
@@ -97,14 +97,14 @@ Feature: files and folders can be deleted from the trashbin
   @issue-product-188 @skipOnOC10 @issue-4582
   Scenario: Select all files and delete from trashbin in a batch
     When the user marks all files for batch action using the webUI
-    And the user batch deletes the marked files using the webUI
+    And the user batch deletes the market files permanently using the webUI
     Then there should be no resources listed on the webUI
 
   @skipOnOC10 @issue-product-188
   # after the issue is fixed delete this scenario and use the one above
   Scenario: Select all files and delete from trashbin in a batch (ocis bug demonstration)
     When the user marks all files for batch action using the webUI
-    And the user batch deletes the marked files using the webUI
+    And the user batch deletes the market files permanently using the webUI
     Then file "lorem.txt" should not be listed on the webUI
     But folder "simple-folder" should be listed on the webUI
 

tests/acceptance/pageObjects/FilesPageElement/filesList.js

@@ -267,18 +267,6 @@ module.exports = {
         .waitForElementVisible('@checkBoxAllFiles')
         .click('@checkBoxAllFiles')
     },
-    /**
-     * Restores all the selected files/folders
-     *
-     */
-    restoreSelected: function () {
-      return this.waitForElementVisible('@restoreSelectedButton')
-        .initAjaxCounters()
-        .useXpath()
-        .click('@restoreSelectedButton')
-        .waitForOutstandingAjaxCalls()
-        .useCss()
-    },
 
     /**
      * Toggle enable or disable file/folder select checkbox
@@ -708,10 +696,6 @@ module.exports = {
       selector: '//input[@type="checkbox"]',
       locateStrategy: 'xpath'
     },
-    restoreSelectedButton: {
-      selector: '//span[contains(text(),"Restore")]',
-      locateStrategy: 'xpath'
-    },
     collaboratorsList: {
       selector: '.files-collaborators-lists'
     },

tests/acceptance/pageObjects/personalPage.js

@@ -321,7 +321,7 @@ module.exports = {
       selector: '#new-file-menu-btn:enabled'
     },
     deleteSelectedButton: {
-      selector: '#delete-selected-btn'
+      selector: '.oc-files-actions-delete-trigger'
     },
     newResourceDropdown: {
       selector: '#new-file-menu-drop'
@@ -341,9 +341,6 @@ module.exports = {
     newFileInput: {
       selector: '#new-file-input'
     },
-    newFolderOkButton: {
-      selector: '#new-folder-ok'
-    },
     breadcrumb: {
       selector: '#files-breadcrumb li:nth-of-type(2)'
     },
@@ -393,10 +390,10 @@ module.exports = {
       selector: '.oc-modal-body-input .oc-text-input'
     },
     moveSelectedBtn: {
-      selector: '#move-selected-btn'
+      selector: '.oc-files-actions-move-trigger'
     },
     copySelectedBtn: {
-      selector: '#copy-selected-btn'
+      selector: '.oc-files-actions-copy-trigger'
     },
     editorCloseBtn: {
       selector: '#markdown-editor-app-bar .uk-text-right .oc-button'

tests/acceptance/pageObjects/sharedWithMePage.js

@@ -159,7 +159,7 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     batchDeclineSharesButton: {
-      selector: '#decline-selected-shares-btn'
+      selector: '.oc-files-actions-decline-share-trigger'
     }
   }
 }

tests/acceptance/pageObjects/trashbinPage.js

@@ -19,11 +19,32 @@ module.exports = {
         .initAjaxCounters()
         .click('@clearTrashbin')
         .waitForOutstandingAjaxCalls()
+    },
+    restoreSelected: function () {
+      return this.waitForElementVisible('@restoreSelectedButton')
+        .initAjaxCounters()
+        .click('@restoreSelectedButton')
+        .waitForOutstandingAjaxCalls()
+    },
+    deleteSelectedPermanently: function () {
+      return this.waitForElementVisible('@deleteSelectedPermanentlyButton')
+        .click('@deleteSelectedPermanentlyButton')
+        .waitForElementVisible('@dialog')
+        .waitForAnimationToFinish() // wait for transition on the modal to finish
+        .click('@dialogConfirmBtnEnabled')
+        .waitForAjaxCallsToStartAndFinish()
+        .waitForElementNotPresent('@dialog')
     }
   },
   elements: {
     clearTrashbin: {
-      selector: '#delete-selected-btn'
+      selector: '.oc-files-actions-empty-trash-bin-trigger'
+    },
+    restoreSelectedButton: {
+      selector: '.oc-files-actions-restore-trigger'
+    },
+    deleteSelectedPermanentlyButton: {
+      selector: '.oc-files-actions-delete-permanent-trigger'
     }
   }
 }

tests/acceptance/stepDefinitions/filesContext.js

@@ -528,6 +528,10 @@ When('the user marks all files for batch action using the webUI', function () {
   return client.page.FilesPageElement.filesList().checkAllFiles()
 })
 
+When('the user batch deletes the marked files permanently using the webUI', function () {
+  return client.page.trashBinPage().deleteSelectedPermanently()
+})
+
 When('the user/public batch deletes the marked files using the webUI', function () {
   return client.page.personalPage().deleteAllCheckedFiles()
 })
@@ -541,6 +545,17 @@ When('the user batch unshares these files using the webUI', async function (shar
   return client.page.sharedWithMePage().unshareAllCheckedFiles()
 })
 
+When(
+  'the user batch deletes these files permanently using the webUI',
+  async function (fileOrFolders) {
+    for (const item of fileOrFolders.rows()) {
+      await client.page.FilesPageElement.filesList().toggleFileOrFolderCheckbox('enable', item[0])
+    }
+
+    return client.page.trashBinPage().deleteSelectedPermanently()
+  }
+)
+
 When('the user batch deletes these files using the webUI', async function (fileOrFolders) {
   for (const item of fileOrFolders.rows()) {
     await client.page.FilesPageElement.filesList().toggleFileOrFolderCheckbox('enable', item[0])
@@ -599,7 +614,7 @@ When('the user clears the trashbin', function () {
 })
 
 When('the user batch restores the marked files using the webUI', function () {
-  return client.page.FilesPageElement.filesList().restoreSelected()
+  return client.page.trashbinPage().restoreSelected()
 })
 
 When('the user opens the sidebar for file/folder {string} on the webUI', function (item) {