From a77f7a1ec0f6dec5e179114d67825bbf6ae85630 Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Mon, 2 Jan 2023 17:43:26 +0100 Subject: [PATCH] [full-ci] chore: bump web to v7.0.0-rc.4 (#5313) * chore: bump web to v7.0.0-rc.4 * fix unexpected passes update test context menu language strings --- .drone.env | 4 +-- .drone.star | 7 +---- .../ui/tests/acceptance/helpers/language.js | 4 +++ services/web/Makefile | 2 +- ...res-webUI-on-OCIS-storage-ocisSmokeTest.md | 3 -- ...expected-failures-webUI-on-OCIS-storage.md | 28 ++++--------------- 6 files changed, 14 insertions(+), 34 deletions(-) diff --git a/.drone.env b/.drone.env index 833ca8ab8..5d7350a11 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=001c91595bbf8c9591ee0c971b5d78e9fc1a481b CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=7dfd87f63374aba68d8bc888dd0b86cee2fa68d5 -WEB_BRANCH=stable-6.0 +WEB_COMMITID=57ca0720be49891dd283eac99769555774e1fdf2 +WEB_BRANCH=master diff --git a/.drone.star b/.drone.star index 417b29d75..b964328bd 100644 --- a/.drone.star +++ b/.drone.star @@ -136,13 +136,8 @@ config = { "skipExceptParts": [], "earlyFail": True, }, - # disable ocis e2e tests for this pr. - # ocis needs the web pr to pass, but that pr needs this pr to pass, circular problems.... - # will be re-enabled after the web-pr passed and web is bumped in ocis. - # https://github.com/owncloud/ocis/pull/5312 - # https://github.com/owncloud/web/pull/8171 "e2eTests": { - "skip": True, + "skip": False, "earlyFail": True, }, "settingsUITests": { diff --git a/services/settings/ui/tests/acceptance/helpers/language.js b/services/settings/ui/tests/acceptance/helpers/language.js index aac996a50..d720300fd 100644 --- a/services/settings/ui/tests/acceptance/helpers/language.js +++ b/services/settings/ui/tests/acceptance/helpers/language.js @@ -57,6 +57,7 @@ const filesListHeaderMenu = { 'Name', 'Shares', 'Size', + 'Tags', 'Modified', 'Actions' ], @@ -64,6 +65,7 @@ const filesListHeaderMenu = { 'Name', 'Geteilt', 'Größe', + 'Schlagwörter', 'Bearbeitet', 'Aktionen' ], @@ -71,6 +73,7 @@ const filesListHeaderMenu = { 'Nombre', 'Shares', 'Tamaño', + 'Tags', 'Modificado', 'Acciones' ], @@ -78,6 +81,7 @@ const filesListHeaderMenu = { 'Nom', 'Shares', 'Taille', + 'Étiquettes', 'Modifié', 'Actions' ] diff --git a/services/web/Makefile b/services/web/Makefile index 54c87a7c6..3eb80e32b 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v6.0.0 +WEB_ASSETS_VERSION = v7.0.0-rc.4 include ../../.make/recursion.mk diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage-ocisSmokeTest.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage-ocisSmokeTest.md index 8c8f7c3be..14ad0124d 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage-ocisSmokeTest.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage-ocisSmokeTest.md @@ -10,6 +10,3 @@ Level-3 headings should be used for the references to the relevant issues. Inclu Other free text and Markdown formatting can be used elsewhere in the document if needed. But if you want to explain something about the issue, then please post that in the issue itself. Only the web scenarios tagged ocisSmokeTest are run by default in OCIS CI. This file lists the expected-failures of those ocisSmokeTest scenarios. - -### [Copy private link option not available](https://github.com/owncloud/ocis/issues/1409) -- [webUIPrivateLinks/accessingPrivateLinks.feature:9](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L9) diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index 3e8788c19..a71f3b264 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -34,20 +34,12 @@ Other free text and markdown formatting can be used elsewhere in the document if ### [when sharer renames the shared resource, sharee get the updated name](https://github.com/owncloud/ocis/issues/2256) - [webUIRenameFiles/renameFiles.feature:226](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L226) -### [Scoped links](https://github.com/owncloud/web/issues/6844) -- [webUIFilesCopy/copyPrivateLinks.feature:20](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L20) -- [webUIFilesCopy/copyPrivateLinks.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L21) - ### [Cannot create users with special characters](https://github.com/owncloud/ocis/issues/1417) - [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:37](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L37) - [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L38) - [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:39](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L39) - [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:36](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L36) -### [webUI-Private-Links](https://github.com/owncloud/web/issues/6844) -- [webUIPrivateLinks/accessingPrivateLinks.feature:9](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L9) -- [webUIPrivateLinks/accessingPrivateLinks.feature:23](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L23) - ### [Share additional info](https://github.com/owncloud/ocis/issues/1253) - [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:138](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L138) @@ -88,10 +80,10 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUILogin/openidLogin.feature:60](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUILogin/openidLogin.feature#L60) ### [Comments in sidebar](https://github.com/owncloud/web/issues/1158) -- [webUIFilesDetails/fileDetails.feature:90](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L90) -- [webUIFilesDetails/fileDetails.feature:106](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L106) -- [webUIFilesDetails/fileDetails.feature:123](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L123) -- [webUIFilesDetails/fileDetails.feature:140](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L140) +- [webUIFilesDetails/fileDetails.feature:84](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L90) +- [webUIFilesDetails/fileDetails.feature:98](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L106) +- [webUIFilesDetails/fileDetails.feature:113](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L123) +- [webUIFilesDetails/fileDetails.feature:128](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L140) ### [Deletion of a recursive folder from trashbin is not possible](https://github.com/owncloud/product/issues/188) - [webUITrashbinDelete/trashbinDelete.feature:51](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L51) @@ -121,10 +113,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingExternal/federationSharing.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L38) - [webUISharingExternal/federationSharing.feature:166](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L166) -### [not possible to overwrite a received shared file](https://github.com/owncloud/ocis/issues/2267) -- [webUISharingInternalGroups/shareWithGroups.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L77) -- [webUISharingInternalUsers/shareWithUsers.feature:55](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L55) - ### [web config update is not properly reflected after the ocis start](https://github.com/owncloud/ocis/issues/2944) - [webUIFiles/breadcrumb.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/breadcrumb.feature#L50) @@ -132,13 +120,9 @@ 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) ### [Favorites deactivated in ocis temporarily](https://github.com/owncloud/ocis/issues/1228) -- [webUIFilesDetails/fileDetails.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L50) -- [webUIFilesDetails/fileDetails.feature:70](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L70) +- [webUIFilesDetails/fileDetails.feature:47](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L50) +- [webUIFilesDetails/fileDetails.feature:67](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L70) - [webUIRenameFiles/renameFiles.feature:249](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L249) -### [Copy/move not possible from and into shares in oCIS](https://github.com/owncloud/web/issues/6892) -- [webUIFilesCopy/copy.feature:89](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copy.feature#L89) -- [webUIFilesCopy/copy.feature:101](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copy.feature#L101) - ### [PROPFIND to sub-folder of a shared resources with same name gives 404](https://github.com/owncloud/ocis/issues/3859) - [webUISharingAcceptShares/acceptShares.feature:240](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L240)