From f5191720366d1ddaeec9ac4e7a92191db8b1ad27 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 9 Feb 2023 22:33:40 +0100 Subject: [PATCH 1/2] chore: bump web v7.0.0-rc.12 --- .drone.env | 2 +- services/web/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.env b/.drone.env index ff209a280d..008d86afff 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for UI tests -WEB_COMMITID=99028c2d3dde103e5bab6636396ea92f2d9fbcea +WEB_COMMITID=6bcdcc5c0ccf7a13bc8f9da2e342073a07744705 WEB_BRANCH=master diff --git a/services/web/Makefile b/services/web/Makefile index 34c3661854..c0deb1f2fd 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v7.0.0-rc.11 +WEB_ASSETS_VERSION = v7.0.0-rc.12 include ../../.make/recursion.mk From f2f64fdcae054d920229d463cbf33071ca64376e Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Thu, 9 Feb 2023 23:31:08 +0100 Subject: [PATCH 2/2] fix flaky --- tests/acceptance/features/bootstrap/SpacesContext.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php index 072ad928a4..7b7e5deaea 100644 --- a/tests/acceptance/features/bootstrap/SpacesContext.php +++ b/tests/acceptance/features/bootstrap/SpacesContext.php @@ -3282,11 +3282,13 @@ class SpacesContext implements Context { $recipientId = $this->getUserIdByUserName($user); foreach ($spaceAsArray['root']['permissions'] as $permission) { $foundRoleInResponse = false; - if ($permission['roles'][0] === $role || $permission['grantedToIdentities'][0][$recipientType]['id'] === $recipientId) { - $foundRoleInResponse = true; - break; + if (\array_key_exists($recipientType, $permission['grantedToIdentities'][0])) { + if ($permission['roles'][0] === $role || $permission['grantedToIdentities'][0][$recipientType]['id'] === $recipientId) { + $foundRoleInResponse = true; + break; + } + Assert::assertTrue($foundRoleInResponse, "the response does not contain the $recipientType $recipient"); } - Assert::assertTrue($foundRoleInResponse, "the response does not contain the $recipientType $recipient"); } } }