From 5ed64de7c2d6cf3b053fb39ff1fe366ed25e5ff8 Mon Sep 17 00:00:00 2001
From: Viktor Scharf <scharf.vi@gmail.com>
Date: Thu, 16 May 2024 11:11:52 +0200
Subject: [PATCH] replace UI link test

---
 .drone.star                                   |  10 +-
 .../src/views/spaces/GenericSpace.vue         |   2 +-
 .../shareByPublicLinkDifferentRoles.feature   | 280 ------------------
 .../e2e/cucumber/features/shares/link.feature |  32 ++
 4 files changed, 35 insertions(+), 289 deletions(-)
 delete mode 100644 tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature

diff --git a/.drone.star b/.drone.star
index c072cdfb77f..a6315d3d185 100644
--- a/.drone.star
+++ b/.drone.star
@@ -98,11 +98,7 @@ config = {
             "servers": [
                 "",
             ],
-            "suites": {
-                "oCISSharingPublic2": [
-                    "webUISharingPublicDifferentRoles",
-                ],
-            },
+            "suites": {},
             "extraEnvironment": {
                 "NODE_TLS_REJECT_UNAUTHORIZED": "0",
                 "SERVER_HOST": "https://ocis:9200",
@@ -119,9 +115,7 @@ config = {
     "build": True,
 }
 
-basicTestSuites = [
-    "webUISharingPublicDifferentRoles",
-]
+basicTestSuites = []
 
 # minio mc environment variables
 minio_mc_environment = {
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index fd99d116d0d..a09951539bc 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -17,9 +17,9 @@
         <template #actions="{ limitedScreenSpace }">
           <oc-button
             v-if="isEmbedModeEnabled"
-            class="oc-mr-s"
             key="new-folder-btn"
             v-oc-tooltip="limitedScreenSpace ? $gettext('New folder') : ''"
+            class="oc-mr-s"
             data-testid="btn-new-folder"
             :aria-label="$gettext('New folder')"
             appearance="filled"
diff --git a/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature b/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature
deleted file mode 100644
index 8a66090e306..00000000000
--- a/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature
+++ /dev/null
@@ -1,280 +0,0 @@
-@mailhog @public_link_share-feature-required
-Feature: Share by public link with different roles
-  As a user
-  I want to share files through a publicly accessible link with different roles
-  So that users who do not have an account on my ownCloud server can access them
-
-  As an admin
-  I want to limit the ability of a user to share files/folders through a publicly accessible link
-  So that public sharing is limited according to organization policy
-
-  Background:
-    Given user "Alice" has been created with default attributes and without skeleton files in the server
-    And user "Alice" has created folder "simple-folder" in the server
-
-  Scenario Outline: simple sharing by public link with read-only role
-    Given user "Alice" has created file "simple-folder/lorem.txt" in the server
-    And user "Alice" has logged in using the webUI
-    When the user creates a new public link for folder "simple-folder" using the webUI
-    And the user sets the role of the most recently created public link of resource "simple-folder" to "<role>"
-    Then user "Alice" should have a share with these details in the server:
-      | field       | value          |
-      | share_type  | public_link    |
-      | uid_owner   | Alice          |
-      | permissions | <permissions>  |
-      | path        | /simple-folder |
-    # Once issue @issue-ocis-reva-383 is resolved uncomment lines below
-    #   | name        | Link           |
-    # And a link named "Link" should be listed with role "<role>" in the public link list of folder "simple-folder" on the webUI
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    Then file "lorem.txt" should be listed on the webUI
-    Examples:
-      | role   | permissions |
-      | Viewer | read        |
-
-  @smokeTest @ocisSmokeTest @issue-ocis-reva-383
-  Scenario Outline: simple sharing by public link with different roles
-    Given user "Alice" has created file "simple-folder/lorem.txt" in the server
-    And user "Alice" has logged in using the webUI
-    When the user creates a new public link for folder "simple-folder" using the webUI
-    And the user sets the role of the most recently created public link of resource "simple-folder" to "<role>"
-    Then user "Alice" should have a share with these details in the server:
-      | field       | value          |
-      | share_type  | public_link    |
-      | uid_owner   | Alice          |
-      | permissions | <permissions>  |
-      | path        | /simple-folder |
-      | name        | Link           |
-    And a link named "Link" should be listed with role "<displayed-role>" in the public link list of folder "simple-folder" on the webUI
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    Then file "lorem.txt" should be listed on the webUI
-    Examples:
-      | role        | displayed-role                  | permissions                  |
-      | Viewer      | Anyone with the link can view   | read                         |
-      | Editor      | Anyone with the link can edit   | read, update, create, delete |
-      | Contributor | Anyone with the link can upload | read, create                 |
-
-  @issue-ocis-reva-383
-  Scenario Outline: simple sharing by public link with different roles (ocis bug demonstration)
-    Given user "Alice" has created file "simple-folder/lorem.txt" in the server
-    And user "Alice" has logged in using the webUI
-    When the user creates a new public link for folder "simple-folder" using the webUI
-    And the user sets the role of the most recently created public link of resource "simple-folder" to "<role>"
-    Then user "Alice" should have a share with these details in the server:
-      | field       | value          |
-      | share_type  | public_link    |
-      | uid_owner   | Alice          |
-      | permissions | <permissions>  |
-      | path        | /simple-folder |
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    Then file "lorem.txt" should be listed on the webUI
-    Examples:
-      | role        | permissions                  |
-      | Editor      | read, update, create, delete |
-      | Contributor | read, create                 |
-
-  @issue-ocis-reva-383
-  Scenario: sharing by public link with "Uploader" role
-    Given user "Alice" has created file "simple-folder/fileInside" in the server
-    And user "Alice" has logged in using the webUI
-    And the user creates a new public link for folder "simple-folder" using the webUI
-    And the user sets the role of the most recently created public link of resource "simple-folder" to "Uploader"
-    Then user "Alice" should have a share with these details in the server:
-      | field       | value          |
-      | share_type  | public_link    |
-      | uid_owner   | Alice          |
-      | permissions | create         |
-      | path        | /simple-folder |
-      | name        | Link           |
-    And a link named "Link" should be listed with role "Secret File Drop" in the public link list of folder "simple-folder" on the webUI
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    Then the user should be redirected to the files-drop page
-
-  @issue-ocis-reva-383
-  Scenario: sharing by public link with "Uploader" role (ocis bug demonstration)
-    Given user "Alice" has logged in using the webUI
-    And the user creates a new public link for folder "simple-folder" using the webUI
-    And the user sets the role of the most recently created public link of resource "simple-folder" to "Uploader"
-    Then user "Alice" should have a share with these details in the server:
-      | field       | value          |
-      | share_type  | public_link    |
-      | uid_owner   | Alice          |
-      | permissions | create         |
-      | path        | /simple-folder |
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    Then the user should be redirected to the files-drop page
-
-  @issue-4582 @disablePreviews
-  Scenario: creating a public link with "Editor" role makes it possible to delete files via the link
-    Given user "Alice" has created the following folders in the server
-      | entry_name                        |
-      | simple-folder/simple-empty-folder |
-    And user "Alice" has created the following files in the server
-      | entry_name                                          |
-      | simple-folder/lorem.txt                             |
-      | simple-folder/strängé filename (duplicate #2 &).txt |
-      | simple-folder/zzzz-must-be-last-file-in-folder.txt  |
-    And user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions in the server
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    And the user deletes the following elements using the webUI
-      | name                                  |
-      | simple-empty-folder                   |
-      | lorem.txt                             |
-      | strängé filename (duplicate #2 &).txt |
-    And the user deletes the following elements using the webUI
-      | name                                 |
-      | zzzz-must-be-last-file-in-folder.txt |
-    Then the deleted elements should not be listed on the webUI
-    And the deleted elements should not be listed on the webUI after a page reload
-
-  @issue-4582 @disablePreviews
-  Scenario: creating a public link with "Editor" role makes it possible to delete files via the link even with password set
-    Given user "Alice" has created the following folders in the server
-      | entry_name                        |
-      | simple-folder/simple-empty-folder |
-    And user "Alice" has created the following files in the server
-      | entry_name                                          |
-      | simple-folder/lorem.txt                             |
-      | simple-folder/strängé filename (duplicate #2 &).txt |
-      | simple-folder/zzzz-must-be-last-file-in-folder.txt  |
-    And user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "#Passw0rd" in the server
-    When the public uses the webUI to access the last public link created by user "Alice" with password "#Passw0rd" in a new session
-    And the user deletes the following elements using the webUI
-      | name                                  |
-      | simple-empty-folder                   |
-      | lorem.txt                             |
-      | strängé filename (duplicate #2 &).txt |
-      | zzzz-must-be-last-file-in-folder.txt |
-    Then the deleted elements should not be listed on the webUI
-
-  @issue-ocis-270
-  Scenario: creating a public link with "Viewer" role only makes it impossible to delete files via the link
-    Given user "Alice" has created file "simple-folder/lorem.txt" in the server
-    And user "Alice" has shared folder "simple-folder" with link with "read" permissions in the server
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    Then it should not be possible to delete file "lorem.txt" using the webUI
-
-
-  Scenario: creating a public link with "Editor" role makes it possible to upload a file
-    Given user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions in the server
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    And the user uploads file "new-lorem.txt" using the webUI
-    Then file "new-lorem.txt" should be listed on the webUI
-    And as "Alice" file "simple-folder/new-lorem.txt" should exist in the server
-
-
-  Scenario: creating a public link with "Editor" role makes it possible to upload a file inside a subdirectory with password set
-    Given user "Alice" has created folder "simple-folder/simple-empty-folder" in the server
-    And user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "#Passw0rd" in the server
-    When the public uses the webUI to access the last public link created by user "Alice" with password "#Passw0rd" in a new session
-    And the user opens folder "simple-empty-folder" using the webUI
-    And the user uploads file "new-lorem.txt" using the webUI
-    Then file "new-lorem.txt" should be listed on the webUI
-    And as "Alice" file "simple-folder/simple-empty-folder/new-lorem.txt" should exist in the server
-
-
-  Scenario: creating a public link with "Editor" role makes it possible to upload a folder
-    Given user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions in the server
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    And the user uploads folder "PARENT" using the webUI
-    Then folder "PARENT" should be listed on the webUI
-    And folder "CHILD" should be listed in the folder "PARENT" on the webUI
-    And file "child.txt" should be listed in the folder "CHILD" on the webUI
-    And as "Alice" file "simple-folder/PARENT/CHILD/child.txt" should exist in the server
-
-
-  Scenario: creating a public link with "Editor" role makes it possible to upload a folder inside a subdirectory
-    Given user "Alice" has created folder "simple-folder/simple-empty-folder" in the server
-    And user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions in the server
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    And the user opens folder "simple-empty-folder" using the webUI
-    And the user uploads folder "PARENT" using the webUI
-    Then folder "PARENT" should be listed on the webUI
-    And folder "CHILD" should be listed in the folder "PARENT" on the webUI
-    And file "child.txt" should be listed in the folder "CHILD" on the webUI
-    And as "Alice" file "simple-folder/simple-empty-folder/PARENT/CHILD/child.txt" should exist in the server
-
-
-  Scenario: creating a public link with "Editor" role makes it possible to upload files via the link even with password set
-    Given user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "#Passw0rd" in the server
-    When the public uses the webUI to access the last public link created by user "Alice" with password "#Passw0rd" in a new session
-    And the user uploads file "new-lorem.txt" using the webUI
-    Then file "new-lorem.txt" should be listed on the webUI
-    And as "Alice" file "simple-folder/new-lorem.txt" should exist in the server
-
-  Scenario: creating a public link with "Editor" role makes it possible to upload files inside a subdirectory
-    Given user "Alice" has created folder "simple-folder/simple-empty-folder" in the server
-    And user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions in the server
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    And the user opens folder "simple-empty-folder" using the webUI
-    And the user uploads file "new-lorem.txt" using the webUI
-    Then file "new-lorem.txt" should be listed on the webUI
-    And as "Alice" file "simple-folder/simple-empty-folder/new-lorem.txt" should exist in the server
-
-
-  Scenario: creating a public link with "Editor" role makes it possible to upload a folder even with password set
-    Given user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "#Passw0rd" in the server
-    When the public uses the webUI to access the last public link created by user "Alice" with password "#Passw0rd" in a new session
-    And the user uploads folder "PARENT" using the webUI
-    Then folder "PARENT" should be listed on the webUI
-    And folder "CHILD" should be listed in the folder "PARENT" on the webUI
-    And file "child.txt" should be listed in the folder "CHILD" on the webUI
-    And as "Alice" file "simple-folder/PARENT/CHILD/child.txt" should exist in the server
-
-
-  Scenario: creating a public link with "Editor" role makes it possible to upload a folder inside a sub-directory even with password set
-    Given user "Alice" has created folder "simple-folder/simple-empty-folder" in the server
-    And user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "#Passw0rd" in the server
-    When the public uses the webUI to access the last public link created by user "Alice" with password "#Passw0rd" in a new session
-    And the user opens folder "simple-empty-folder" using the webUI
-    And the user uploads folder "PARENT" using the webUI
-    Then folder "PARENT" should be listed on the webUI
-    And folder "CHILD" should be listed in the folder "PARENT" on the webUI
-    And file "child.txt" should be listed in the folder "CHILD" on the webUI
-    And as "Alice" file "simple-folder/simple-empty-folder/PARENT/CHILD/child.txt" should exist in the server
-
-  @issue-ocis-723
-  Scenario: creating a public link with "Viewer" role makes it impossible to create files via the link even with password set
-    Given user "Alice" has shared folder "simple-folder" with link with "read" permissions and password "#Passw0rd" in the server
-    When the public uses the webUI to access the last public link created by user "Alice" with password "#Passw0rd" in a new session
-    Then the create button should not be visible on the webUI
-
-
-  Scenario: creating a public link with "Uploader" role makes it possible to upload a file through files-drop page
-    Given user "Alice" has shared folder "simple-folder" with link with "create" permissions in the server
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    And the public uploads file "new-lorem.txt" in files-drop page
-    Then the following files should be listed on the files-drop page:
-      | new-lorem.txt |
-    And as "Alice" file "simple-folder/new-lorem.txt" should exist in the server
-
-
-  Scenario: creating a public link with "Uploader" role makes it possible to upload multiple files via files-drop page
-    Given user "Alice" has shared folder "simple-folder" with link with "create" permissions in the server
-    When the public uses the webUI to access the last public link created by user "Alice" in a new session
-    And the public uploads file "'single'quotes.txt" in files-drop page
-    And the public uploads file "new-lorem.txt" in files-drop page
-    Then the following files should be listed on the files-drop page:
-      | new-lorem.txt |
-    And as "Alice" the content of "simple-folder/'single'quotes.txt" in the server should be the same as the content of local file "'single'quotes.txt"
-    And as "Alice" the content of "simple-folder/new-lorem.txt" in the server should be the same as the content of local file "new-lorem.txt"
-
-  @issue-ocis-723
-  Scenario: creating a public link with "Uploader" role makes it possible to create files through files-drop page even with password set
-    Given user "Alice" has shared folder "simple-folder" with link with "create" permissions and password "#Passw0rd" in the server
-    When the public uses the webUI to access the last public link created by user "Alice" with password "#Passw0rd" in a new session
-    And the public uploads file "'single'quotes.txt" in files-drop page
-    Then the following files should be listed on the files-drop page:
-      | 'single'quotes.txt |
-    And as "Alice" the content of "simple-folder/'single'quotes.txt" in the server should be the same as the content of local file "'single'quotes.txt"
-
-  @issue-ocis-723
-  Scenario: creating a public link with "Uploader" role makes it possible to upload multiple files via files-drop page even with password set
-    Given user "Alice" has shared folder "simple-folder" with link with "create" permissions and password "#Passw0rd" in the server
-    When the public uses the webUI to access the last public link created by user "Alice" with password "#Passw0rd" in a new session
-    And the public uploads file "'single'quotes.txt" in files-drop page
-    And the public uploads file "new-lorem.txt" in files-drop page
-    Then the following files should be listed on the files-drop page:
-      | new-lorem.txt |
-    And as "Alice" the content of "simple-folder/'single'quotes.txt" in the server should be the same as the content of local file "'single'quotes.txt"
-    And as "Alice" the content of "simple-folder/new-lorem.txt" in the server should be the same as the content of local file "new-lorem.txt"
diff --git a/tests/e2e/cucumber/features/shares/link.feature b/tests/e2e/cucumber/features/shares/link.feature
index af356af6ac5..1bfa403d45c 100644
--- a/tests/e2e/cucumber/features/shares/link.feature
+++ b/tests/e2e/cucumber/features/shares/link.feature
@@ -7,6 +7,9 @@ Feature: link
 
 
   Scenario: public link
+    Given "Admin" creates following user using API
+      | id    |
+      | Brian |
     When "Alice" logs in
     And "Alice" creates the following folders in personal space using API
       | name                   |
@@ -28,7 +31,36 @@ Feature: link
     And "Anonymous" drop uploads following resources
       | resource     |
       | textfile.txt |
+
+    # authenticated user
+    When "Brian" logs in
+    And "Brian" opens the public link "myPublicLink"
+    And "Brian" unlocks the public link with password "%public%"
+    And "Brian" drop uploads following resources
+      | resource   |
+      | simple.pdf |
+
+
+    When "Alice" opens folder "folderPublic"
+    Then following resources should be displayed in the files list for user "Alice"
+      | resource     |
+      | textfile.txt |
+      | simple.pdf   |
+    And "Alice" opens the "files" app
     And "Alice" edits the public link named "myPublicLink" of resource "folderPublic" changing role to "Can edit"
+
+    And "Brian" refreshes the old link
+    Then following resources should be displayed in the files list for user "Brian"
+      | resource     |
+      | textfile.txt |
+      | simple.pdf   |
+      | SubFolder    |
+      | lorem.txt    |
+    And "Brian" deletes the following resources from public link using sidebar panel
+      | resource   |
+      | simple.pdf |
+    And "Brian" logs out
+
     And "Anonymous" refreshes the old link
     And "Anonymous" downloads the following public link resources using the sidebar panel
       | resource     | type |