From 32d4deb97a29ab5d2bc1dca4492a2aa55bfc44f5 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 4 May 2022 19:09:26 +0200 Subject: [PATCH 1/3] Bump web to v5.5.0-rc.3 --- .drone.env | 2 +- changelog/unreleased/update-web-5.5.0.md | 7 ++++--- extensions/web/Makefile | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.drone.env b/.drone.env index 7a92e2cd66..f322540de5 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=4ee9352f4df70cb49cdd539f5a6f0275d369605a CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=4d0b216f0ef6ad9708d414aca60920fdb877e5ab +WEB_COMMITID=eb00649279daab8442dd392bb34b85ab1e1d75ef WEB_BRANCH=master diff --git a/changelog/unreleased/update-web-5.5.0.md b/changelog/unreleased/update-web-5.5.0.md index cb1bfe545b..880e3bff20 100644 --- a/changelog/unreleased/update-web-5.5.0.md +++ b/changelog/unreleased/update-web-5.5.0.md @@ -1,9 +1,10 @@ -Enhancement: Update ownCloud Web to v5.5.0-rc.2 +Enhancement: Update ownCloud Web to v5.5.0-rc.3 Tags: web -We updated ownCloud Web to v5.5.0-rc.2. Please refer to the changelog (linked) for details on the web release. +We updated ownCloud Web to v5.5.0-rc.3. Please refer to the changelog (linked) for details on the web release. https://github.com/owncloud/web/pull/6854 https://github.com/owncloud/ocis/pull/3664 -https://github.com/owncloud/web/releases/tag/v5.5.0-rc.2 +https://github.com/owncloud/ocis/pull/3680 +https://github.com/owncloud/web/releases/tag/v5.5.0-rc.3 diff --git a/extensions/web/Makefile b/extensions/web/Makefile index 1200e1fb9a..433b09f1f8 100644 --- a/extensions/web/Makefile +++ b/extensions/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v5.5.0-rc.2 +WEB_ASSETS_VERSION = v5.5.0-rc.3 include ../../.make/recursion.mk From a4d6fb9549230da62abb367dc472fa98b2c139d0 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Wed, 4 May 2022 20:43:56 +0200 Subject: [PATCH 2/3] adapt expected failures --- tests/acceptance/expected-failures-webUI-on-OCIS-storage.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index 788d9505f3..f0249bba61 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -32,9 +32,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIFavorites/unfavoriteFile.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L72) - [webUIFavorites/unfavoriteFile.feature:89](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L89) - [webUIFavorites/unfavoriteFile.feature:104](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L104) -- [webUIFilesSearch/search.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L50) - [webUIFilesSearch/search.feature:103](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L103) -- [webUIFilesSearch/search.feature:129](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L129) - [webUIFilesSearch/search.feature:153](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L153) - [webUIFilesSearch/search.feature:165](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L165) - [webUIFilesSearch/search.feature:175](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L175) From 9079f3bd8fc4d46d6dfebb8897fc6b386a99af9d Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Wed, 4 May 2022 23:03:56 +0200 Subject: [PATCH 3/3] add regression to expected failures --- tests/acceptance/expected-failures-webUI-on-OCIS-storage.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index f0249bba61..a3b29737e6 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -247,6 +247,9 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIResharing2/reshareUsers.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L72) - [webUIResharing2/reshareUsers.feature:73](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L73) +### [Regression during ocis 2.0.0-beta](https://github.com/owncloud/ocis/issues/3627) +- [webUISharingInternalGroups/shareWithGroups.feature:19](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L19) + ### [Different share permissions provides varying roles in oc10 and ocis](https://github.com/owncloud/ocis/issues/1277) - [webUISharingInternalGroups/shareWithGroups.feature:166](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L166) - [webUISharingInternalGroups/shareWithGroups.feature:180](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L180)