From 2a0cc63eb4cbd71f9f97f9326bcf3e33fb02d706 Mon Sep 17 00:00:00 2001 From: Jannik Stehle <50302941+JammingBen@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:04:16 +0000 Subject: [PATCH] fix: resolving external URLs via file ID (#9833) * fix: resolving external URLs via file ID * test: fix unit tests * improve method naming * fix: redirect after closing external apps --- deployments/oc10-app.md | 1 - getting-started.md | 4 ---- testing/testing.md | 9 ++++----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/deployments/oc10-app.md b/deployments/oc10-app.md index aeace71bf2f..ce9602fcfde 100644 --- a/deployments/oc10-app.md +++ b/deployments/oc10-app.md @@ -85,7 +85,6 @@ There are a few config values which need to be set in order for ownCloud Web to "apps" : [ "files", "preview", - "search", "draw-io" ], "applications" : [ diff --git a/getting-started.md b/getting-started.md index 31c1c0d17f8..9bd27eb20e3 100644 --- a/getting-started.md +++ b/getting-started.md @@ -76,10 +76,6 @@ Depending on the backend you are using, there are sample config files provided i - `options.contextHelpersReadMore` Specifies whether the "Read more" link should be displayed or not. - `options.openLinksWithDefaultApp` Specifies whether single file link shares should be opened with default app or not. - `options.tokenStorageLocal` Specifies whether the access token will be stored in the local storage when set to `true` or in the session storage when set to `false`. If stored in the local storage, login state will be persisted across multiple browser tabs, means no additional logins are required. Defaults to `true`. -- `options.loginUrl` Specifies the target URL to the login page. This is helpful when an external IdP is used. This option is disabled by default. Example URL like: 'https://www.myidp.com/login'. -- `options.logoutUrl` Adds a link to the user's profile page to point him to an external page, where he can manage his session and devices. This is helpful when an external IdP is used. This option is disabled by default. -- `options.imprintUrl` Specifies the target URL for the imprint link valid for the ocis instance in the account menu. -- `options.privacyUrl` Specifies the target URL for the privacy link valid for the ocis instance in the account menu. #### Scripts and Styles diff --git a/testing/testing.md b/testing/testing.md index 8d17456e268..aead5528136 100644 --- a/testing/testing.md +++ b/testing/testing.md @@ -61,7 +61,7 @@ Bundle the web frontend with the following command: $ pnpm build:w ``` -Our compose setup automatically mounts it into an oCIS backend, respectively. Web also gets recompiled on changes. +Our compose setup automatically mounts it into an oC10 and oCIS backend, respectively. Web also gets recompiled on changes. #### Run E2E Tests @@ -77,7 +77,6 @@ To run a particular test, simply add the feature file and line number to the tes Various options are available via ENV variables, e.g. -- `BASIC_AUTH=true` use basic authorization for api requests. - `RETRY=n` to retry failures `n` times - `SLOW_MO=n` to slow the execution time by `n` milliseconds - `TIMEOUT=n` to set tests to timeout after `n` milliseconds @@ -127,12 +126,12 @@ $ pnpm build:w The acceptance tests need additional docker containers to be running. ```shell -$ docker compose up ocis selenium middleware-ocis +$ docker compose up ocis vnc selenium middleware-ocis ``` and make sure there are no conflicting ports and everything runs smoothly. You can check if everything has worked by opening [https://host.docker.internal:9200](https://host.docker.internal:9200) and logging in using the demo user (admin/admin). -If you're using a M1 Mac, you need to use `seleniarm/standalone-chromium:4.7.0-20221206`for now. To do so, export `SELENIUM_IMAGE=seleniarm/standalone-chromium:4.7.0-20221206`. +If you're using a M1 Mac, you need to use `seleniarm/standalone-chromium:4.4.0-20220814`for now. To do so, export `SELENIUM_IMAGE=seleniarm/standalone-chromium:4.4.0-20220814`. #### Run acceptance tests @@ -146,7 +145,7 @@ If you're using a M1 Mac, you need to use `seleniarm/standalone-chromium:4.7.0-2 #### Watch the Test Run -To watch the tests while running, open [http://host.docker.internal:7900/](http://host.docker.internal:7900/) in the browser to access your VNC client. +To watch the tests while running, open [http://host.docker.internal:6080/](http://host.docker.internal:6080/) in the browser to access your VNC client. ### Analyze the Test Report