Merge pull request #11115 from vector-im/bwindels/merge-e2e-tests

clarify where the e2e tests are located
This commit is contained in:
Bruno Windels 2019-10-21 12:20:53 +00:00 committed by GitHub
commit 5b1c615498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -162,13 +162,13 @@ override the desktop app's default settings if desired.
Running from Docker Running from Docker
=================== ===================
The Docker image can be used to serve riot-web as a web server. The easiest way to use The Docker image can be used to serve riot-web as a web server. The easiest way to use
it is to use the prebuilt image: it is to use the prebuilt image:
```bash ```bash
docker run -p 80:80 vectorim/riot-web docker run -p 80:80 vectorim/riot-web
``` ```
To supply your own custom `config.json`, map a volume to `/app/config.json`. For example, To supply your own custom `config.json`, map a volume to `/app/config.json`. For example,
if your custom config was located at `/etc/riot-web/config.json` then your Docker command if your custom config was located at `/etc/riot-web/config.json` then your Docker command
would be: would be:
```bash ```bash
@ -326,6 +326,10 @@ changes), in an instance of Chrome on your desktop, with `yarn
test-multi`. This also gives you the option of running the tests in 'debug' test-multi`. This also gives you the option of running the tests in 'debug'
mode, which is useful for stepping through the tests in the developer tools. mode, which is useful for stepping through the tests in the developer tools.
### End-to-End tests
See [matrix-react-sdk](https://github.com/matrix-org/matrix-react-sdk/#end-to-end-tests) how to run the end-to-end tests.
Translations Translations
============ ============