From b55d98284a26915ef8e0ad0826136368ea1c4ba3 Mon Sep 17 00:00:00 2001 From: amrita Date: Tue, 17 Jan 2023 11:35:06 +0545 Subject: [PATCH] Rebase conflict --- tests/e2e/cucumber/features/smoke/share.ocis.feature | 4 +--- tests/e2e/support/objects/app-files/share/index.ts | 5 ++--- tests/e2e/support/objects/app-files/share/utils.ts | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/e2e/cucumber/features/smoke/share.ocis.feature b/tests/e2e/cucumber/features/smoke/share.ocis.feature index eeb665b4ce8..f2a8d7d98d1 100644 --- 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 index ea11d6a9946..db0dc2be761 100644 --- 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 { await this.#page.reload() - return await isAcceptedSharePresent(this.#page, resource, owner) + return await isAcceptedSharePresent({ page: this.#page, resource, owner }) } async hasPermissionToShare(resource: string): Promise { diff --git a/tests/e2e/support/objects/app-files/share/utils.ts b/tests/e2e/support/objects/app-files/share/utils.ts index 73c74bff179..aa3338f419c 100644 --- 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,