Rebase conflict

owncloud · Jan 17, 2023 · b55d982 · b55d982
1 parent ecd6ee1
commit b55d982
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/tests/e2e/cucumber/features/smoke/share.ocis.feature b/tests/e2e/cucumber/features/smoke/share.ocis.feature
@@ -11,11 +11,9 @@ Feature: share
       | name                   |
       | folder_to_shared       |
       | folder_to_customShared |
+      | folder_to_shared       |
     And "Alice" logs in
     And "Alice" opens the "files" app
-    And "Alice" creates the following resources
-      | resource         | type   |
-      | folder_to_shared | folder |
     And "Alice" uploads the following resource
       | resource      | to                     |
       | lorem.txt     | folder_to_shared       |

diff --git a/tests/e2e/support/objects/app-files/share/index.ts b/tests/e2e/support/objects/app-files/share/index.ts
@@ -5,7 +5,6 @@ import {
   acceptShare,
   changeShareeRole,
   removeShareeArgs,
-  isAcceptedSharePresent,
   removeSharee,
   ShareArgs,
   ShareStatusArgs,
@@ -14,7 +13,7 @@ import {
   hasPermissionToShare,
   copyQuickLink
 } from './actions'
-import { resourceIsNotOpenable } from './utils'
+import { resourceIsNotOpenable,isAcceptedSharePresent } from './utils'
 import { copyLinkArgs } from '../link/actions'
 
 export class Share {
@@ -60,7 +59,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 isAcceptedSharePresent({ page: this.#page, resource, owner })
   }
 
   async hasPermissionToShare(resource: string): Promise<boolean> {

diff --git a/tests/e2e/support/objects/app-files/share/utils.ts b/tests/e2e/support/objects/app-files/share/utils.ts
@@ -30,7 +30,7 @@ export const resourceIsNotOpenable = async ({
   return true
 }
 
-export const acceptedShareExists = async ({
+export const isAcceptedSharePresent = async ({
   page,
   resource,
   owner,