Fix e2e tests

owncloud · Oct 12, 2022 · a8dc37c · a8dc37c
1 parent 7cdfc30
commit a8dc37c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 11 deletions.
diff --git a/tests/e2e/cucumber/steps/app-files/resource.ts b/tests/e2e/cucumber/steps/app-files/resource.ts
@@ -167,11 +167,14 @@ Then(
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const resourceObject = new objects.applicationFiles.Resource({ page })
     for (const info of stepTable.hashes()) {
-      const message = await resourceObject.deleteTrashBin({ resource: info.resource })
-      const paths = info.resource.split('/')
       if (actionType === 'should not') {
-        expect(message).toBe(`failed to delete "${paths[paths.length - 1]}"`)
+        const isVisible = await resourceObject.isDeleteTrashBinButtonVisible({
+          resource: info.resource
+        })
+        expect(isVisible).toBe(false)
       } else {
+        const message = await resourceObject.deleteTrashBin({ resource: info.resource })
+        const paths = info.resource.split('/')
         expect(message).toBe(`"${paths[paths.length - 1]}" was deleted successfully`)
       }
     }
@@ -190,14 +193,16 @@ Then(
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const resourceObject = new objects.applicationFiles.Resource({ page })
     for (const info of stepTable.hashes()) {
-      const message = await resourceObject.restoreTrashBin({
-        resource: info.resource,
-        actionType
-      })
-      const paths = info.resource.split('/')
       if (actionType === 'should not') {
-        expect(message).toBe(`failed to restore "${paths[paths.length - 1]}"`)
+        const isVisible = await resourceObject.isRestoreTrashBinButtonVisible({
+          resource: info.resource
+        })
+        expect(isVisible).toBe(false)
       } else {
+        const message = await resourceObject.restoreTrashBin({
+          resource: info.resource
+        })
+        const paths = info.resource.split('/')
         expect(message).toBe(`${paths[paths.length - 1]} was restored successfully`)
       }
     }

diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -471,9 +471,22 @@ export const deleteResourceTrashbin = async (args: deleteResourceArgs): Promise<
   return message.trim().toLowerCase()
 }
 
+export const getDeleteResourceButtonVisibility = async (
+  args: deleteResourceArgs
+): Promise<boolean> => {
+  const { page, resource } = args
+  const resourceCheckbox = page.locator(
+    util.format(checkBoxForTrashbin, `/${resource.replace(/^\/+/, '')}`)
+  )
+  await new Promise((resolve) => setTimeout(resolve, 5000))
+  if (!(await resourceCheckbox.isChecked())) {
+    await resourceCheckbox.check()
+  }
+  return await page.locator(permanentDeleteButton).isVisible()
+}
+
 export interface restoreResourceTrashbinArgs {
   resource: string
-  actionType: string
   page: Page
 }
 
@@ -499,6 +512,20 @@ export const restoreResourceTrashbin = async (
   return message.trim().toLowerCase()
 }
 
+export const getRestoreResourceButtonVisibility = async (
+  args: restoreResourceTrashbinArgs
+): Promise<boolean> => {
+  const { page, resource } = args
+  const resourceCheckbox = page.locator(
+    util.format(checkBoxForTrashbin, `/${resource.replace(/^\/+/, '')}`)
+  )
+  await new Promise((resolve) => setTimeout(resolve, 5000))
+  if (!(await resourceCheckbox.isChecked())) {
+    await resourceCheckbox.check()
+  }
+  return await page.locator(restoreResourceButton).isVisible()
+}
+
 export interface searchResourceGlobalSearchArgs {
   keyword: string
   page: Page

diff --git a/tests/e2e/support/objects/app-files/resource/index.ts b/tests/e2e/support/objects/app-files/resource/index.ts
@@ -28,7 +28,9 @@ import {
   editResources,
   editResourcesArgs,
   openFileInViewer,
-  openFileInViewerArgs
+  openFileInViewerArgs,
+  getDeleteResourceButtonVisibility,
+  getRestoreResourceButtonVisibility
 } from './actions'
 
 export class Resource {
@@ -115,13 +117,23 @@ export class Resource {
     return message
   }
 
+  async isDeleteTrashBinButtonVisible(args: Omit<deleteResourceArgs, 'page'>): Promise<boolean> {
+    return await getDeleteResourceButtonVisibility({ ...args, page: this.#page })
+  }
+
   async restoreTrashBin(args: Omit<restoreResourceTrashbinArgs, 'page'>): Promise<string> {
     const startUrl = this.#page.url()
     const message = await restoreResourceTrashbin({ ...args, page: this.#page })
     await this.#page.goto(startUrl)
     return message
   }
 
+  async isRestoreTrashBinButtonVisible(
+    args: Omit<restoreResourceTrashbinArgs, 'page'>
+  ): Promise<boolean> {
+    return await getRestoreResourceButtonVisibility({ ...args, page: this.#page })
+  }
+
   async searchResource(args: Omit<searchResourceGlobalSearchArgs, 'page'>): Promise<void> {
     await searchResourceGlobalSearch({ ...args, page: this.#page })
   }