Rebase conflict

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

Hide file tree

Showing 3 changed files with 13 additions and 16 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 |
+      | shared_folder          |
     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       |
@@ -33,9 +31,9 @@ Feature: share
       | folder_to_shared       |
       | folder_to_customShared |
     Then "Brian" should not be able to open the folder "shared_folder"
-    When "Brian" accepts the following share
-      | name             |
-      | folder_to_shared |
+    When "Brian" accepts the following share from the context menu
+      | name          |
+      | shared_folder |
     And "Brian" declines the following share
       | name          |
       | shared_folder |
@@ -98,7 +96,7 @@ Feature: share
       | testavatar.jpeg  | Brian     | user | viewer |
       | simple.pdf       | Brian     | user | viewer |
       | sharedFile.txt   | Brian     | user | editor |
-    When "Brian" logs in
+    And "Brian" logs in
     And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     Then "Brian" should not be able to open the file "shareToBrian.txt"

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
@@ -3,7 +3,7 @@ import util from 'util'
 import { resourceNameSelector, fileRow } from '../resource/actions'
 
 const acceptedShareItem =
-    '//*[@data-test-resource-name="%s"]/ancestor::tr//span[@data-test-user-name="%s"]'
+  '//*[@data-test-resource-name="%s"]/ancestor::tr//span[@data-test-user-name="%s"]'
 
 export const resourceIsNotOpenable = async ({
   page,
@@ -17,10 +17,10 @@ export const resourceIsNotOpenable = async ({
   await Promise.all([
     page.waitForResponse((resp) => {
       return (
-          (resp.url().endsWith(encodeURIComponent(resource)) ||
-              resp.url().endsWith(encodeURIComponent(itemId))) &&
-          resp.status() === 404 &&
-          resp.request().method() === 'PROPFIND'
+        (resp.url().endsWith(encodeURIComponent(resource)) ||
+          resp.url().endsWith(encodeURIComponent(itemId))) &&
+        resp.status() === 404 &&
+        resp.request().method() === 'PROPFIND'
       )
     }),
     resourceLocator.click()
@@ -30,7 +30,7 @@ export const resourceIsNotOpenable = async ({
   return true
 }
 
-export const acceptedShareExists = async ({
+export const isAcceptedSharePresent = async ({
   page,
   resource,
   owner,