backporting from master

owncloud · Feb 28, 2024 · 6757508 · 6757508
1 parent bdc5988
commit 6757508
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 113 deletions.
diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
@@ -52,4 +52,4 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUIUpload/upload.feature:43](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L43)
 
 ### [PROPFIND to sub-folder of a shared resources with same name gives 404](https://github.com/owncloud/ocis/issues/3859)
--   [webUISharingAcceptShares/acceptShares.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L88)
+-   [webUISharingAcceptShares/acceptShares.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L72)
diff --git a/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature
@@ -11,21 +11,6 @@ Feature: accept/decline shares coming from internal users
       | Brian    |
     And user "Brian" has logged in using the webUI
 
-  @issue-ocis-1950
-  Scenario: reject a share that you received as user and as group member
-    Given these groups have been created in the server:
-      | groupname |
-      | grp1      |
-    And user "Alice" has created folder "/simple-folder" in the server
-    And user "Brian" has been added to group "grp1" in the server
-    And user "Alice" has shared folder "/simple-folder" with user "Brian" in the server
-    And user "Alice" has shared folder "/simple-folder" with group "grp1" in the server
-    And the user has browsed to the shared-with-me page
-    When the user declines share "simple-folder" offered by user "Alice Hansen" using the webUI
-    Then folder "simple-folder" shared by "Alice Hansen" should be in "Declined" state on the webUI
-    When the user browses to the files page
-    Then folder "/Shares" should not be listed on the webUI
-
 
   Scenario: User receives files when auto accept share is disabled - oCIS behavior
     Given user "Alice" has created file "toshare.txt" in the server

diff --git a/tests/e2e/cucumber/features/smoke/search/search.feature b/tests/e2e/cucumber/features/smoke/search/search.feature
@@ -116,29 +116,6 @@ Feature: Search
       | resource          |
       | strängéनेपालीName |
 
-    And "Alice" navigates to the shared with me page
-    When "Alice" reshares the following resource
-      | resource             | recipient | type | role     | resourceType |
-      | new_share_from_brian | Carol     | user | Can view | folder       |
-      | new-lorem-big.txt    | Carol     | user | Can view | file         |
-    And "Alice" logs out
-
-    # search re-shared resources
-    When "Carol" logs in
-    And "Carol" opens the "files" app
-    And "Carol" creates the following resources
-      | resource | type   |
-      | folder   | folder |
-    And "Carol" searches "NEW" using the global search and the "all files" filter
-    Then following resources should be displayed in the search list for user "Carol"
-      | resource             |
-      | new_share_from_brian |
-      | new-lorem-big.txt    |
-    But following resources should not be displayed in the search list for user "Carol"
-      | resource |
-      | folder   |
-    And "Carol" logs out
-
 
   Scenario: Search using "current folder" filter
     Given "Admin" creates following users using API

diff --git a/tests/e2e/cucumber/features/smoke/shares/reshare.feature b/tests/e2e/cucumber/features/smoke/shares/reshare.feature
diff --git a/tests/e2e/cucumber/steps/ui/shares.ts b/tests/e2e/cucumber/steps/ui/shares.ts
@@ -49,22 +49,6 @@ When(
   }
 )
 
-When(
-  '{string} reshares the following resource(s)',
-  async function (this: World, stepUser: string, stepTable: DataTable) {
-    const { page } = this.actorsEnvironment.getActor({ key: stepUser })
-    const shareObject = new objects.applicationFiles.Share({ page })
-    const shareInfo = parseShareTable(stepTable, this.usersEnvironment)
-
-    for (const resource of Object.keys(shareInfo)) {
-      await shareObject.create({
-        resource,
-        recipients: shareInfo[resource]
-      })
-    }
-  }
-)
-
 When(
   '{string} accepts the following share(s)',
   async function (this: World, stepUser: string, stepTable: DataTable) {

diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -23,7 +23,7 @@ const checkBoxForTrashbin = `//*[@data-test-resource-path="%s"]//ancestor::tr//i
 export const fileRow =
   '//ancestor::*[(contains(@class, "oc-tile-card") or contains(@class, "oc-tbody-tr"))]'
 export const resourceNameSelector =
-  ':is(#files-space-table, .oc-tiles-item, #files-shared-with-me-accepted-section, .files-table) [data-test-resource-name="%s"]'
+  ':is(#files-space-table, .oc-tiles-item, .files-table) [data-test-resource-name="%s"]'
 const breadcrumbResourceNameSelector =
   '//span[contains(@class, "oc-breadcrumb-item-text") and text()="%s"]'
 const addNewResourceButton = `#new-file-menu-btn`