From 91bd401a8a79e9883eff06986e72b956b6cc5fd0 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 11 Jan 2021 18:49:39 +0545 Subject: [PATCH 1/4] Update WEB_COMMITID for tests --- .drone.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index 110351d1efb..307cd2d39c2 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=85da111d5ec5660f7294a789304b4bfc32580d95 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=4d5539fe1ebb3eab700ca692a9d7407cc650de1d +WEB_COMMITID=467733e26d4bda42896f89f2768929b22b7c3815 WEB_BRANCH=master From cf424e9bb66a58d4089b8cb7d60588aa796bae3d Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 11 Jan 2021 19:12:18 +0545 Subject: [PATCH 2/4] Add expected-failures-webUI for OCIS issue 1124 --- .../acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt index 62a4ecb3cc9..d6a6b6a5794 100644 --- a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt +++ b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt @@ -402,6 +402,9 @@ webUIUpload/uploadEdgecases.feature:105 webUIUpload/uploadEdgecases.feature:121 webUIUpload/uploadFileGreaterThanQuotaSize.feature:12 # +# https://github.com/owncloud/ocis/issues/1124 restoring a file deleted from a received shared folder is not possible +webUITrashbinRestore/trashbinRestore.feature:240 +# # https://github.com/owncloud/web/issues/4601 Adjust web UI test scenarios that demonstrate fixed bugs webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:165 webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:166 From 653aeef46025f1690330f02d17ba7f2e880eaada Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 11 Jan 2021 20:14:21 +0545 Subject: [PATCH 3/4] Adjust expected-failures-webUI for imageMediaViewer test changes --- ...ected-failures-webUI-on-OWNCLOUD-storage.txt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt index d6a6b6a5794..375021f34b9 100644 --- a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt +++ b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt @@ -1,8 +1,8 @@ # this file contains the scenarios from web tests that are currently expected to fail on OCIS with owncloud storage # # https://github.com/owncloud/ocisissues/1106 media viewer does not support mp3 files -webUIPreview/imageMediaViewer.feature:78 -webUIPreview/imageMediaViewer.feature:85 +webUIPreview/imageMediaViewer.feature:81 +webUIPreview/imageMediaViewer.feature:88 # # https://github.com/owncloud/web/issues/4564 authentication dialog appears when user is deleted # https://github.com/owncloud/ocis/issues/1129 login error page loops when logged in user is deleted @@ -184,7 +184,14 @@ webUISharingInternalUsersBlacklisted/shareWithUsers.feature:90 webUILogin/login.feature:52 # # Image-Media-Viewer-Issue -webUIPreview/imageMediaViewer.feature:30 +webUIPreview/imageMediaViewer.feature:33 +# +# https://github.com/owncloud/web/issues/4296 media viewer does not display jpeg file +webUIPreview/imageMediaViewer.feature:15 +# +# +webUIPreview/imageMediaViewer.feature:100 +webUIPreview/imageMediaViewer.feature:114 # # webUI-Private-Links webUIPrivateLinks/accessingPrivateLinks.feature:8 @@ -415,3 +422,7 @@ webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:122 webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:298 webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:275 webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:212 +# +# https://github.com/owncloud/ocis/issues/1197 Investigate why some imageMediaViewer web UI tests fail when run in OCIS CI +webUIPreview/imageMediaViewer.feature:100 +webUIPreview/imageMediaViewer.feature:114 From 168d8a7fbc26f00ba213d30951b91bfcfb03c2b8 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 11 Jan 2021 20:17:09 +0545 Subject: [PATCH 4/4] Adjust expected-failures-webUI for shareWithUsers test changes --- tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt index 375021f34b9..907379deea2 100644 --- a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt +++ b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt @@ -426,3 +426,4 @@ webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:212 # https://github.com/owncloud/ocis/issues/1197 Investigate why some imageMediaViewer web UI tests fail when run in OCIS CI webUIPreview/imageMediaViewer.feature:100 webUIPreview/imageMediaViewer.feature:114 +webUISharingInternalUsers/shareWithUsers.feature:585