diff --git a/.woodpecker.star b/.woodpecker.star index 9a984332f5..f0c721b48f 100644 --- a/.woodpecker.star +++ b/.woodpecker.star @@ -727,6 +727,7 @@ def openCloudService(extra_env_config = {}, deploy_type = "opencloud"): "OC_SHOW_USER_EMAIL_IN_RESULTS": True, # Needed for enabling all roles "GRAPH_AVAILABLE_ROLES": "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6,63e64e19-8d43-42ec-a738-2b6af2610efa", + "ACTIVITYLOG_WRITE_BUFFER_DURATION": "0", } if deploy_type == "federation": diff --git a/deployments/examples/oc_web/docker-compose.yml b/deployments/examples/oc_web/docker-compose.yml index 5ed0a1874a..d571cd6e0d 100644 --- a/deployments/examples/oc_web/docker-compose.yml +++ b/deployments/examples/oc_web/docker-compose.yml @@ -91,6 +91,7 @@ services: OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: banned-password-list.txt # make collabora the secure view app FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: eu.opencloud.api.collaboration.Collabora + ACTIVITYLOG_WRITE_BUFFER_DURATION: '0' volumes: - ./config/opencloud/proxy.yaml:/etc/opencloud/proxy.yaml - ./config/opencloud/app-registry.yaml:/etc/opencloud/app-registry.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 9047966de5..3b80c6b94e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ x-opencloud-server: &opencloud-service OC_PASSWORD_POLICY_MIN_SPECIAL_CHARACTERS: '0' OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: '/etc/opencloud/password-policy-banned-passwords.txt' OC_SHOW_USER_EMAIL_IN_RESULTS: 'true' + ACTIVITYLOG_WRITE_BUFFER_DURATION: '0' # WEB WEB_ASSET_CORE_PATH: ${WEB_ASSET_CORE_PATH:-/web/dist} diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts index dbae1290f4..217bce866f 100644 --- a/tests/e2e/support/objects/app-files/resource/actions.ts +++ b/tests/e2e/support/objects/app-files/resource/actions.ts @@ -2172,7 +2172,15 @@ export const checkActivity = async ({ await clickResource({ page, path }) } await sidebar.open({ page: page, resource: finalResource }) - await sidebar.openPanel({ page: page, name: 'activities' }) + await Promise.all([ + page.waitForResponse( + (resp) => + resp.status() === 200 && + resp.request().method() === 'GET' && + resp.request().url().includes('/extensions/org.libregraph/activities') + ), + sidebar.openPanel({ page: page, name: 'activities' }) + ]) await expect(page.getByTestId(activitySidebarPanel)).toBeVisible() await expect(page.locator(activitySidebarPanelBodyContent)).toContainText(activity) }