[full-ci]Port #10919 #10905 #10873 #10864 #10841 to stable (#10927)

* combine steps (#10841) * [test-only] e2e tests for space sse events (#10864) * e2e tests for space sse events * rework assertions * [test-only] check lock sse event (#10873) * check lock sse event * lint fix * link indication (#10905) * replace UI link test (#10919) * back resourceNameSelector * fix after rebase * test: revert changes needed for stable branch * test: fix scenario --------- Co-authored-by: Saw-jan <saw.jan.grg3e@gmail.com>
owncloud · May 17, 2024 · b54f5e7 · b54f5e7
1 parent 29840de
commit b54f5e7
Show file tree

Hide file tree

Showing 43 changed files with 421 additions and 698 deletions.
diff --git a/.drone.star b/.drone.star
@@ -100,14 +100,7 @@ config = {
             "servers": [
                 "",
             ],
-            "suites": {
-                "oCISSharingPublic2": [
-                    "webUISharingPublicManagement",
-                ],
-                "oCISSharingPublic3": [
-                    "webUISharingPublicDifferentRoles",
-                ],
-            },
+            "suites": {},
             "extraEnvironment": {
                 "NODE_TLS_REJECT_UNAUTHORIZED": "0",
                 "SERVER_HOST": "https://ocis:9200",
@@ -124,11 +117,7 @@ config = {
     "build": True,
 }
 
-basicTestSuites = [
-    "webUISharingAcceptShares",
-    "webUISharingPublicDifferentRoles",
-    "webUISharingPublicManagement",
-]
+basicTestSuites = []
 
 # minio mc environment variables
 minio_mc_environment = {

diff --git a/...eptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature b/...eptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature
diff --git a/tests/acceptance/features/webUISharingPublicManagement/publicLinkIndicator.feature b/tests/acceptance/features/webUISharingPublicManagement/publicLinkIndicator.feature
diff --git a/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature b/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature
diff --git a/tests/acceptance/features/webUISharingPublicManagement/sharingPublicSession.feature b/tests/acceptance/features/webUISharingPublicManagement/sharingPublicSession.feature
diff --git a/tests/e2e/cucumber/features/app-provider/lock.feature b/tests/e2e/cucumber/features/app-provider/lock.feature
@@ -1,3 +1,4 @@
+@sse
 Feature: lock
   As a user
   I can see that a file is locked if it is opened by a user with edit permissions,
@@ -14,15 +15,10 @@ Feature: lock
     And "Alice" creates the following files into personal space using API
       | pathToFile | content      |
       | test.odt   | some content |
-    And "Alice" creates the following folder in personal space using API
-      | name   |
-      | folder |
     And "Alice" shares the following resource using API
       | resource | recipient | type | role     |
       | test.odt | Brian     | user | Can edit |
-
     And "Brian" logs in
-    And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     When "Brian" opens the following file in Collabora
       | resource |
@@ -32,18 +28,20 @@ Feature: lock
     When "Alice" opens the "files" app
     Then for "Alice" file "test.odt" should be locked
 
-    # checking that sharing/unsharing and creating link of the locked file is possible
+    # checking that user cannot 'move', 'rename', 'delete' locked file
+    And "Alice" should not be able to edit file "test.odt"
+
+    # checking that user cannot delete or change share of the locked file
+    # https://github.com/owncloud/web/issues/10507
+    And "Alice" should not be able to manage share with user "Brian"
+
+    # checking that sharing and creating link of the locked file is possible
     And "Alice" creates a public link of following resource using the sidebar panel
       | resource | password |
       | test.odt | %public% |
     And "Alice" shares the following resource using the sidebar panel
       | resource | recipient | type | role     | resourceType |
       | test.odt | Carol     | user | Can view | file         |
-    # unsharing should remove lock https://github.com/owncloud/ocis/issues/8273
-    # And "Alice" removes following sharee
-    #   | resource | recipient |
-    #   | test.odt | Brian     |
-    And "Brian" logs out
 
     When "Alice" reloads the page
     Then for "Alice" file "test.odt" should not be locked

diff --git a/tests/e2e/cucumber/features/journeys/kindergarten.feature b/tests/e2e/cucumber/features/journeys/kindergarten.feature
@@ -20,7 +20,6 @@ Feature: Kindergarten can use web to organize a day
 
   Scenario: Alice can share this weeks meal plan with all parents
     When "Alice" logs in
-    And "Alice" opens the "files" app
     And "Alice" navigates to the personal space page
     And "Alice" creates the following resources
       | resource                             | type   |
@@ -63,15 +62,13 @@ Feature: Kindergarten can use web to organize a day
       | groups/Teddy Bear Daycare/meal plan/data.zip       | Carol     | user  | custom_permissions:read,update        | file         |
     # Then what do we check for to be confident that the above things done by Alice have worked?
     When "Brian" logs in
-    And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     And "Brian" downloads the following resources using the sidebar panel
       | resource | from      | type |
       | data.zip | meal plan | file |
     # Then what do we check for to be confident that the above things done by Brian have worked?
     # Then the downloaded zip should contain... ?
     When "Carol" logs in
-    And "Carol" opens the "files" app
     And "Carol" navigates to the shared with me page
     And "Carol" downloads the following resources using the sidebar panel
       | resource      | from      | type   |