Review address

tests/e2e/cucumber/features/smoke/share.ocis.feature

@@ -47,14 +47,15 @@ Feature: share
     And "Alice" removes following sharee
       | resource               | recipient |
       | folder_to_customShared | Brian     |
-    Then "Brian" should not be able to see the following shares
-      | resource               | owner        |
-      | folder_to_customShared | Alice Hansen |
     And "Alice" deletes the following resources
       | resource                       |
       | folder_to_shared/lorem_new.txt |
       | folder_to_shared               |
     And "Alice" logs out
+    Then "Brian" should not be able to see the following shares
+      | resource               | owner        |
+      | folder_to_customShared | Alice Hansen |
+      | folder_to_shared       | Alice Hansen |
     And "Brian" logs out
 
 

tests/e2e/cucumber/steps/ui/shares.ts

@@ -95,8 +95,6 @@ When(
   '{string} removes following sharee(s)',
   async function (this: World, stepUser: string, stepTable: DataTable) {
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
-    const pageObject = new objects.applicationFiles.page.spaces.Personal({ page })
-    await pageObject.navigate()
     const shareObject = new objects.applicationFiles.Share({ page })
     const shareInfo = parseShareTable(stepTable, this.usersEnvironment)
 

tests/e2e/support/objects/app-files/share/actions.ts

@@ -1,7 +1,6 @@
 import { Page } from 'playwright'
 import util from 'util'
 import Collaborator, { ICollaborator } from './collaborator'
-import { acceptedShareExists } from './utils'
 import { sidebar } from '../utils'
 import { clickResource } from '../resource/actions'
 
@@ -121,14 +120,6 @@ export const checkSharee = async (args: ShareArgs): Promise<void> => {
   }
 }
 
-export const isAcceptedSharePresent = async (
-  page: Page,
-  resource: string,
-  owner: string
-): Promise<boolean> => {
-  return await acceptedShareExists({ page, resource, owner })
-}
-
 export const hasPermissionToShare = async (
   args: Omit<ShareArgs, 'recipients'>
 ): Promise<boolean> => {

tests/e2e/support/objects/app-files/share/index.ts

@@ -5,14 +5,14 @@ import {
   acceptShare,
   changeShareeRole,
   removeShareeArgs,
-  isAcceptedSharePresent,
   removeSharee,
   ShareArgs,
   ShareStatusArgs,
   declineShare,
   checkSharee,
   hasPermissionToShare
 } from './actions'
+import { acceptedShareExists } from './utils'
 
 export class Share {
   #page: Page
@@ -57,7 +57,7 @@ export class Share {
 
   async isAcceptedSharePresent(resource: string, owner: string): Promise<boolean> {
     await this.#page.reload()
-    return await isAcceptedSharePresent(this.#page, resource, owner)
+    return await acceptedShareExists({ page: this.#page, resource, owner })
   }
 
   async hasPermissionToShare(resource: string): Promise<boolean> {

tests/e2e/support/objects/app-files/share/utils.ts

@@ -3,6 +3,7 @@ import util from 'util'
 
 const acceptedShareItem =
   '//*[@data-test-resource-name="%s"]/ancestor::tr//span[@data-test-user-name="%s"]'
+
 export const acceptedShareExists = async ({
   page,
   resource,