Skip to content

Commit 9a12718

Browse files
committed
add e2e tests for searching renamed and reshared resources (#9549)
1 parent dc292ed commit 9a12718

File tree

7 files changed

+36
-42
lines changed

7 files changed

+36
-42
lines changed

backend-oc10.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ geekdocFilePath: backend-oc10.md
99

1010
{{< toc >}}
1111

12+
## Compatibility
13+
14+
Please note that the usage of Web UI and ownCloud 10 as backend is not recommended starting with version 7.1.0 of the Web UI. Therefore, this section only applies to versions < 7.1.0.
15+
1216
## Prerequisites
1317

1418
Decide on which host and port Web will be served, for example `https://web-host:9100/web-path/`.

custom-apps/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This page documents how you can set up an example app within your frontend repo
2020
## Setting up the example "skeleton app"
2121

2222
{{< hint info >}}
23-
This guide assumes you have either an oCIS or ownCloud 10 backend running and followed the [getting started guide]({{< ref "../getting-started.md" >}}) for setting up a development environment with the `web` frontend, having it running via either `pnpm serve` or `pnpm build:w`. You should be able to use the web UI on localhost using the respective port you've assigned (defaults are `:8080` for OC10 and `:9200` for oCIS) and see changes to your .
23+
This guide assumes you have an oCIS backend running and followed the [getting started guide]({{< ref "../getting-started.md" >}}) for setting up a development environment with the `web` frontend, having it running via either `pnpm vite` or `pnpm build:w`. You should be able to use the web UI on localhost using the respective port you've assigned (default is `:9200`) and see the changes you make.
2424
{{< /hint >}}
2525

2626
From the root of the [web repository](https://github.com/owncloud/web), change into the example skeleton app by running

deployments/oc10-app.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ geekdocFilePath: oc10-app.md
99

1010
{{< toc >}}
1111

12+
13+
## Compatibility
14+
15+
Please note that the usage of Web UI and ownCloud 10 as backend is not recommended starting with version 7.1.0 of the Web UI. Therefore, this section only applies to versions < 7.1.0.
16+
17+
## Introduction
18+
1219
ownCloud Web is being deployed as an app to [ownCloud marketplace](https://marketplace.owncloud.com/) to enable easy integration into existing ownCloud 10 instances.
1320
After completing this setup, ownCloud Web will be available on `https://<your-owncloud-server>/index.php/apps/web`.
1421

@@ -78,6 +85,7 @@ There are a few config values which need to be set in order for ownCloud Web to
7885
"apps" : [
7986
"files",
8087
"preview",
88+
"search",
8189
"draw-io"
8290
],
8391
"applications" : [

development/tooling.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,23 @@ After cloning the source code, install the dependencies via `pnpm install`.
3030

3131
### Starting the Server
3232

33-
Web supports oCIS and oC10 as servers. You can start both of them by running `docker-compose up ocis oc10`.
33+
You can start the server by running `docker-compose up ocis`.
3434

35-
Note that `ocis` needs a short while to start because it is waiting for `tika` to be initialized. This is the case as soon as the `tika-service` container has stopped running.
35+
Note that the container needs a short while to start because it is waiting for `tika` to be initialized. This is the case as soon as the `tika-service` container has stopped running.
3636

3737
### Building and Accessing Web
3838

3939
After the docker containers are running (and `tika` is being initialized), run `pnpm build:w` to build Web. This also includes hot-reloading after changes you make, although it will take a while to rebuild the project. See down below for some details on how to enable instant hot-reloading.
4040

41-
Now you can access Web via https://host.docker.internal:9200 (oCIS) and http://host.docker.internal:8080 (OC10).
41+
Now you can access Web via https://host.docker.internal:9200.
4242

4343
### Using Instant Hot-Reload via Vite
4444

45-
To work with instant hot-reloading, you can also build Web by running `pnpm vite`. The ports to access Web are slightly different then: https://host.docker.internal:9201 (oCIS) and http://host.docker.internal:8081 (OC10). Also note that the initial page load may take a bit longer than usual. This is normal and to be expected.
45+
To work with instant hot-reloading, you can also build Web by running `pnpm vite`. The port to access Web is slightly different then: https://host.docker.internal:9201. Also note that the initial page load may take a bit longer than usual. This is normal and to be expected.
46+
47+
### Running Web with oC10
48+
49+
Older versions of Web (< 7.1.0) also support running oC10 as server. The development setup is nearly the same as mentioned above, the only differences are:
50+
51+
* The server can be started via `docker-compose up oc10`
52+
* The server port is `8080` (`8081` when running Web via `pnpm vite:oc10`)

getting-started.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This setup currently doesn't work on Windows out of the box.
2727

2828
After cloning the [source code](https://github.com/owncloud/web), install the dependencies via `pnpm install` and bundle the frontend code by running `pnpm build:w`.
2929

30-
Then, you can start the backends by running `docker-compose up oc10 ocis` and access them via [https://host.docker.internal:9200](https://host.docker.internal:9200) (oCIS) and [http://host.docker.internal:8080](http://host.docker.internal:8080) (OC10). If you're not using Docker Desktop, you might have to modify your `/etc/hosts` and add `127.0.0.1 host.docker.internal` to make the `host.docker.internal` links work.
30+
Then, you can start the server by running `docker-compose up ocis` and access it via [https://host.docker.internal:9200](https://host.docker.internal:9200). If you're not using Docker Desktop, you might have to modify your `/etc/hosts` and add `127.0.0.1 host.docker.internal` to make the `host.docker.internal` links work.
3131

3232
The bundled frontend code automatically gets mounted into the Docker containers, recompiles on changes and you can log in using the demo user (admin/admin) and take a look around!
3333

@@ -90,7 +90,7 @@ Web supports [Sentry](https://sentry.io/welcome/) to provide monitoring and erro
9090
To enable sending data to a Sentry instance, you can use the following configuration keys:
9191

9292
- `sentry.dsn` Should contain the DSN for your sentry project.
93-
- `sentry.environment`: Lets you specify the enviroment to use in Sentry. Defaults to `production`.
93+
- `sentry.environment`: Lets you specify the environment to use in Sentry. Defaults to `production`.
9494

9595
Any other key under `sentry` will be forwarded to the Sentry initialization. You can find out more
9696
settings in the [Sentry docs](https://docs.sentry.io/platforms/javascript/configuration/).
@@ -102,13 +102,13 @@ integration libraries.
102102

103103
## Setting up backend and running
104104

105-
Web can run against either [ownCloud 10](https://github.com/owncloud/core/) as backend or [oCIS](https://github.com/owncloud/ocis).
105+
Newer versions of Web (> 7.0.2) can only run against [oCIS](https://github.com/owncloud/ocis), whereas older versions (< 7.1.0) can run against [ownCloud 10](https://github.com/owncloud/core/) as well.
106106
Depending which one you chose, please check the matching section:
107107

108-
- [Setting up with ownCloud as backend]({{< ref "backend-oc10.md" >}})
109108
- [Setting up with oCIS as backend]({{< ref "backend-ocis.md" >}})
109+
- [Setting up with ownCloud as backend]({{< ref "backend-oc10.md" >}})
110110

111111
## Running
112112

113-
- [Running with ownCloud as backend]({{< ref "backend-oc10.md#running-web" >}})
114113
- [Running with oCIS as backend]({{< ref "backend-ocis.md#running-web" >}})
114+
- [Running with ownCloud as backend]({{< ref "backend-oc10.md#running-web" >}})

releasing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ geekdocFilePath: releasing.md
1010

1111
## Releasing ownCloud Web
1212

13-
OwnCloud Web can be hosted standalone, as ownCloud 10 app or as part of oCIS.
13+
OwnCloud Web can be hosted standalone, as part of oCIS or as ownCloud 10 app (Web UI versions < 7.1.0).
1414

1515
### Versioning
1616

@@ -23,7 +23,7 @@ The highest type before a new release determines the version update number, so i
2323
1. Create a branch `release-$version` in <https://github.com/owncloud/web>.
2424
2. Create a folder in `changelog` for the release version and date `mkdir $major.$minor.$patchVersion_YYYY-MM-DD`.
2525
3. Move all changelog items from the `changelog/unreleased/` folder to the `$major.$minor.$patchVersion_YYYY-MM-DD` folder.
26-
4. Update the version in `packages/web-integration-oc10/appinfo/info.xml`
26+
4. Only Web UI versions < 7.1.0: Update the version in `packages/web-integration-oc10/appinfo/info.xml`
2727
5. Update the version in `package.json`
2828
6. Commit your changes.
2929
7. After merging, wait for the CI to run on the merge commit.

testing/testing.md

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,18 @@ Our compose setup automatically mounts it into an oC10 and oCIS backend, respect
6565

6666
#### Run E2E Tests
6767

68-
Depending on the backend you want to run the tests on, you can either run
68+
The following command will run all available e2e tests:
6969

7070
```shell
71-
$ pnpm test:e2e:cucumber 'tests/e2e/cucumber/**/*[!.ocis].feature'
71+
$ pnpm test:e2e:cucumber 'tests/e2e/cucumber/**/*.feature'
7272
```
7373

74-
for an **ownCloud 10** backend (filenames including `.ocis` are excluded) or
75-
76-
```shell
77-
$ OCIS=true pnpm test:e2e:cucumber 'tests/e2e/cucumber/**/*[!.oc10].feature'
78-
```
79-
80-
for an **oCIS** backend (filenames including `.oc10` are excluded).
81-
8274
#### Options
8375

84-
To run a particular test, simply add the feature file and line number to the test command, e.g. `pnpm test:e2e:cucumber tests/e2e/cucumber/shareFileJourney.feature:13`
76+
To run a particular test, simply add the feature file and line number to the test command, e.g. `pnpm test:e2e:cucumber tests/e2e/cucumber/features/smoke/admin-settings/users.feature:84`
8577

8678
Various options are available via ENV variables, e.g.
8779

88-
- `OCIS=true` to run the E2E tests against an oCIS backend
8980
- `RETRY=n` to retry failures `n` times
9081
- `SLOW_MO=n` to slow the execution time by `n` milliseconds
9182
- `TIMEOUT=n` to set tests to timeout after `n` milliseconds
@@ -134,40 +125,24 @@ $ pnpm build:w
134125

135126
The acceptance tests need additional docker containers to be running.
136127

137-
For running the test with oc10 run
138-
139-
```shell
140-
$ docker compose up oc10 vnc selenium middleware-oc10
141-
```
142-
143-
For running the test with ocis run
144-
145128
```shell
146129
$ docker compose up ocis vnc selenium middleware-ocis
147130
```
148131

149-
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) (oCIS) and [http://host.docker.internal:8080](http://host.docker.internal:8080) (OC10) and logging in using the demo user (admin/admin).
132+
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).
150133

151134
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`.
152135

153136
#### Run acceptance tests
154137

155138
- Change the directory to `tests/acceptance`
156139
- Install all the test dependencies with `pnpm` command
157-
- Depending on the backend you're running the tests on, you can either run
158-
159-
```shell
160-
$ pnpm test:acceptance:oc10 features/path/to/test
161-
```
162-
163-
for ownCloud 10.X or
140+
- Run the tests
164141

165142
```shell
166143
$ pnpm test:acceptance:ocis features/path/to/test
167144
```
168145

169-
for oCIS acceptance tests.
170-
171146
#### Watch the Test Run
172147

173148
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.

0 commit comments

Comments
 (0)