From 9e5cb1fcc387937718c6d880efd6d0598a0d127d Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Fri, 23 Feb 2024 10:16:58 +0100 Subject: [PATCH] delete repeated upload tests --- .drone.star | 7 ---- ...-failures-with-ocis-server-ocis-storage.md | 6 +-- .../shareByPublicLink.feature | 18 --------- .../features/webUIUpload/upload.feature | 39 ------------------- .../webUIUserJourney/journey1.feature | 27 ------------- 5 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 tests/acceptance/features/webUIUserJourney/journey1.feature diff --git a/.drone.star b/.drone.star index ec8050b9ed3..6d8e3fcc586 100644 --- a/.drone.star +++ b/.drone.star @@ -153,7 +153,6 @@ config = { "webUITrashbinDelete", "webUITrashbinFilesFolders", "webUITrashbinRestore", - "webUIUserJourney", ], }, "extraEnvironment": { @@ -203,10 +202,6 @@ basicTestSuites = [ "webUIUpload", ] -ocisSpecificTestSuites = [ - "webUIUserJourney", -] - # minio mc environment variables minio_mc_environment = { "CACHE_BUCKET": { @@ -255,8 +250,6 @@ def checkTestSuites(): if (test["type"] == FULL): expected += basicTestSuites - expected += ocisSpecificTestSuites - if (sorted(suites) != sorted(expected)): print("Error: Suites dont match " + testGroupName) print(Diff(sorted(suites), sorted(expected))) diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md index 28dcb6a447c..2669428e6f4 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md @@ -17,10 +17,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUITrashbinRestore/trashbinRestore.feature:176](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature#L176) -### [Saving public share is not possible](https://github.com/owncloud/web/issues/5321) - -- [webUISharingPublicManagement/shareByPublicLink.feature:24](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L24) - ### [empty subfolder inside a folder to be uploaded is not created on the server](https://github.com/owncloud/web/issues/6348) -- [webUIUpload/upload.feature:43](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L43) +- [webUIUpload/upload.feature:36](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L36) diff --git a/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature b/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature index a6d0708d951..055b11339b0 100644 --- a/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature +++ b/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature @@ -20,24 +20,6 @@ Feature: Public link share management 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-5321 - Scenario: mount public link - Given user "Brian" has been created with default attributes and without skeleton files in the server - And user "Alice" has uploaded file with content "Alice file" to "simple-folder/lorem.txt" in the server - And user "Alice" has created a public link with following settings in the server - | path | simple-folder | - | name | Public-link | - | permissions | read, update, create, delete | - When the public uses the webUI to access the last public link created by user "Alice" in a new session - And the public adds the public link to "%remote_server%" as user "Brian" with password "%alt2%" using the webUI in the server - Then folder "simple-folder" should be listed on the webUI - When the user opens folder "simple-folder" using the webUI - Then file "lorem.txt" should be listed on the webUI - And the content of file "simple-folder/lorem.txt" for user "Brian" should be "Alice file" in the server - When the user uploads overwriting file "lorem.txt" using the webUI - Then file "lorem.txt" should be listed on the webUI - And as "Brian" the content of "simple-folder/lorem.txt" in the server should be the same as the content of local file "lorem.txt" - @issue-ocis-1328 Scenario: user shares a file through public link and then it appears in a shared-via-link page Given the setting "shareapi_allow_public_notification" of app "core" has been set to "yes" in the server diff --git a/tests/acceptance/features/webUIUpload/upload.feature b/tests/acceptance/features/webUIUpload/upload.feature index 0a73843907b..2a30f250ff8 100644 --- a/tests/acceptance/features/webUIUpload/upload.feature +++ b/tests/acceptance/features/webUIUpload/upload.feature @@ -11,13 +11,6 @@ Feature: File Upload And user "Alice" has uploaded file with content "initial content" to "simple-folder/lorem.txt" in the server And user "Alice" has logged in using the webUI - @smokeTest @ocisSmokeTest - Scenario: simple upload of a file that does not exist before - When the user uploads file "new-lorem.txt" using the webUI - Then no message should be displayed on the webUI - And file "new-lorem.txt" should be listed on the webUI - And as "Alice" the content of "new-lorem.txt" in the server should be the same as the content of local file "new-lorem.txt" - @smokeTest @ocisSmokeTest Scenario: simple upload of a folder that does not exist before Given a folder "CUSTOM" has been created with the following files in separate sub-folders in the middleware @@ -100,32 +93,6 @@ Feature: File Upload Then file "big-video.mp4" should be listed on the webUI And as "Alice" the content of "big-video.mp4" in the server should be the same as the content of local file "big-video.mp4" - - Scenario: upload a new file into a sub folder - When the user opens folder "simple-folder" using the webUI - And the user uploads file "new-lorem.txt" using the webUI - Then no message should be displayed on the webUI - And file "new-lorem.txt" should be listed on the webUI - 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" - - @smokeTest @disablePreviews - Scenario: overwrite an existing file - When the user uploads overwriting file "lorem.txt" using the webUI - Then no message should be displayed on the webUI - And file "lorem.txt" should be listed on the webUI - And as "Alice" the content of "lorem.txt" in the server should be the same as the content of local file "lorem.txt" - And the versions list for resource "lorem.txt" should contain 1 entry - But file "lorem (2).txt" should not be listed on the webUI - - @smokeTest @disablePreviews @issue-ocis-reva-54 - Scenario: overwrite an existing file when versioning is disabled - Given the app "files_versions" has been disabled in the server - When the user uploads overwriting file "lorem.txt" using the webUI - Then no message should be displayed on the webUI - And file "lorem.txt" should be listed on the webUI - And as "Alice" the content of "lorem.txt" in the server should be the same as the content of local file "lorem.txt" - But file "lorem (2).txt" should not be listed on the webUI - @disablePreviews Scenario: overwrite an existing file in a sub-folder When the user opens folder "simple-folder" using the webUI @@ -141,12 +108,6 @@ Feature: File Upload Then file "lorem.txt" should be listed on the webUI And as "Alice" the content of "simple-folder/lorem.txt" in the server should be the same as the content of local file "lorem.txt" - Scenario: upload a file with comma in the filename - When the user uploads file "file,with,comma,.txt" using the webUI - Then no message should be displayed on the webUI - And file "file,with,comma,.txt" should be listed on the webUI - And as "Alice" the content of "file,with,comma,.txt" should be the same in the server as the content of local file "file,with,comma,.txt" - Scenario: simple upload of a folder, with comma in its name, that does not exist before When the user uploads folder "Folder,With,Comma" using the webUI diff --git a/tests/acceptance/features/webUIUserJourney/journey1.feature b/tests/acceptance/features/webUIUserJourney/journey1.feature deleted file mode 100644 index 0cdbb26492b..00000000000 --- a/tests/acceptance/features/webUIUserJourney/journey1.feature +++ /dev/null @@ -1,27 +0,0 @@ -Feature: User Journey 1 - - As a user - I would like to do basic file operations - - Background: - Given user "Alice" has been created with default attributes and without skeleton files in the server - - @journey - Scenario: simple upload of a file that does not exist before - When user "Alice" has logged in using the webUI - And the user uploads file "new-lorem.txt" using the webUI - Then no message should be displayed on the webUI - And file "new-lorem.txt" should be listed on the webUI - And as "Alice" the content of "new-lorem.txt" in the server should be the same as the content of local file "new-lorem.txt" - When the user browses to the files page - And the user downloads file "new-lorem.txt" using the webUI - Then no message should be displayed on the webUI - When the user renames file "new-lorem.txt" to "new-lorem2.txt" using the webUI - Then file "new-lorem2.txt" should be listed on the webUI - When the user deletes file "new-lorem2.txt" using the webUI - And the user browses to the trashbin page - Then file "new-lorem2.txt" should be listed on the webUI - When the user restores file "new-lorem2.txt" from the trashbin using the webUI - Then there should be no resources listed on the webUI - When the user browses to the files page - Then file "new-lorem2.txt" should be listed on the webUI