From fcc85f9be4960bc12849735fbee3187ed6938b55 Mon Sep 17 00:00:00 2001
From: Dmitry Kruchinin <dmitryx.kruchinin@intel.com>
Date: Wed, 29 Jul 2020 14:53:56 +0300
Subject: [PATCH] Add run cypress in CI with the different config file
 cypress_ci.json

Update CONTRIBUTING.md.
---
 .travis.yml           | 2 +-
 CONTRIBUTING.md       | 7 -------
 tests/cypress.json    | 3 +--
 tests/cypress_ci.json | 4 ++++
 4 files changed, 6 insertions(+), 10 deletions(-)
 create mode 100644 tests/cypress_ci.json

diff --git a/.travis.yml b/.travis.yml
index 7f44b764b23..855a9d7253e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 09fff729350..1c7c7ce5d6e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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
diff --git a/tests/cypress.json b/tests/cypress.json
index ed68fd7c0bc..371abf5a85f 100644
--- a/tests/cypress.json
+++ b/tests/cypress.json
@@ -1,4 +1,3 @@
 {
-    "video": false,
-    "baseUrl": "http://cvat_ui"
+    "baseUrl": "http://localhost:8080"
 }
diff --git a/tests/cypress_ci.json b/tests/cypress_ci.json
new file mode 100644
index 00000000000..ed68fd7c0bc
--- /dev/null
+++ b/tests/cypress_ci.json
@@ -0,0 +1,4 @@
+{
+    "video": false,
+    "baseUrl": "http://cvat_ui"
+}