diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml index 379ba65d2d6..fb6bf98b412 100644 --- a/deployments/examples/ocis_traefik/docker-compose.yml +++ b/deployments/examples/ocis_traefik/docker-compose.yml @@ -46,7 +46,7 @@ services: restart: always ocis: - image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} + image: owncloud/ocis:3.0.0-rc.3 networks: ocis-net: entrypoint: @@ -63,17 +63,18 @@ services: # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) - PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" + PROXY_ENABLE_BASIC_AUTH: "true" # admin user password IDM_ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}" # this overrides the admin password from the configuration file # demo users - IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-false}" + IDM_CREATE_DEMO_USERS: "true" # email server (in this case inbucket acts as mail catcher) NOTIFICATIONS_SMTP_HOST: inbucket NOTIFICATIONS_SMTP_PORT: 2500 NOTIFICATIONS_SMTP_SENDER: oCIS notifications NOTIFICATIONS_SMTP_USERNAME: notifications@${OCIS_DOMAIN:-ocis.owncloud.test} NOTIFICATIONS_SMTP_INSECURE: "true" # the mail catcher uses self signed certificates + OCIS_DECOMPOSEDFS_METADATA_BACKEND: "messagepack" volumes: - ocis-config:/etc/ocis - ocis-data:/var/lib/ocis diff --git a/tests/acceptance/features/bootstrap/SettingsContext.php b/tests/acceptance/features/bootstrap/SettingsContext.php index 6771f1b352d..753a92e15bf 100644 --- a/tests/acceptance/features/bootstrap/SettingsContext.php +++ b/tests/acceptance/features/bootstrap/SettingsContext.php @@ -322,38 +322,26 @@ public function sendRequestGetSettingsValuesList(string $user): void { /** * @param string $user - * @param string $valueName * - * @return array + * @return string * * @throws GuzzleException * @throws Exception */ - public function getSettingsValues(string $user, string $valueName): array { + public function getSettingLanguageValue(string $user): string { $this->sendRequestGetSettingsValuesList($user); $body = json_decode((string)$this->featureContext->getResponse()->getBody(), true, 512, JSON_THROW_ON_ERROR); + + // if no language is set, the request body is empty return English as the default language + if (empty($body)) { + return "en"; + } foreach ($body["values"] as $value) { - if ($value["identifier"]["setting"] === $valueName) { - return $value["value"]; + if ($value["identifier"]["setting"] === "language") { + return $value["value"]["listValue"]["values"][0]["stringValue"]; break; } } - return []; - } - - /** - * @param string $user - * - * @return string - * - * @throws GuzzleException - * @throws Exception - */ - public function getSettingLanguageValue(string $user): string { - $languageValue = $this->getSettingsValues($user, "language"); - Assert::assertNotEmpty($languageValue, "settings values are empty"); - - return $languageValue["listValue"]["values"][0]["stringValue"]; } /**