Skip to content

Commit

Permalink
Add run cypress in CI with the different config file cypress_ci.json
Browse files Browse the repository at this point in the history
Update CONTRIBUTING.md.
  • Loading branch information
Dmitry Kruchinin committed Jul 29, 2020
1 parent 55a29f0 commit fcc85f9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ script:
- docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'coverage run -a manage.py test cvat/apps && coverage run -a manage.py test --pattern="_test*.py" cvat/apps/dataset_manager/tests cvat/apps/engine/tests utils/cli && coverage run -a manage.py test datumaro/ && mv .coverage ${CONTAINER_COVERAGE_DATA_DIR}'
- docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd cvat-data && npm install && cd ../cvat-core && npm install && npm run test && coveralls-lcov -v -n ./reports/coverage/lcov.info > ${CONTAINER_COVERAGE_DATA_DIR}/coverage.json'
# Run cypress tests
- docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd ~/tests && ./node_modules/.bin/cypress run --headless --browser chrome'
- docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd ~/tests && ./node_modules/.bin/cypress run --headless --browser chrome --config-file=cypress_ci.json'

after_success:
# https://coveralls-python.readthedocs.io/en/latest/usage/multilang.html
Expand Down
7 changes: 0 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,6 @@ curl https://github.com/matterport/Mask_RCNN/releases/download/v2.0/mask_rcnn_co

### Run Cypress tests
- Install Сypress as described in the [documentation](https://docs.cypress.io/guides/getting-started/installing-cypress.html).
- Setting the address of the local CVAT server:
Change value for ``baseUrl`` parameter in the ``<cvat_local_repository>/tests/cypress.json``

Example:
```sh
"baseUrl": "http://localhost:8080"
```
- Run cypress tests:
```sh
cd <cvat_local_repository>/tests
Expand Down
3 changes: 1 addition & 2 deletions tests/cypress.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"video": false,
"baseUrl": "http://cvat_ui"
"baseUrl": "http://localhost:8080"
}
4 changes: 4 additions & 0 deletions tests/cypress_ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"video": false,
"baseUrl": "http://cvat_ui"
}

0 comments on commit fcc85f9

Please sign in to comment.