diff --git a/.travis.yml b/.travis.yml index f5cb1b4ef..4afa4c742 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_install: - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin + - cp cypress.env.template.json cypress.env.json install: - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web . @@ -31,9 +32,8 @@ install: script: - docker-compose exec -e NODE_ENV=test webapp yarn run lint - docker-compose exec -e NODE_ENV=test webapp yarn run test - - docker-compose -f ../Nitro-Backend/docker-compose.yml exec backend yarn run db:seed - - wait-on http://localhost:3000 - - cypress run --record --key $CYPRESS_TOKEN + - wait-on http://localhost:7474 && docker-compose -f ../Nitro-Backend/docker-compose.yml exec neo4j migrate + - wait-on http://localhost:3000 && cypress run --record --key $CYPRESS_TOKEN after_success: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh diff --git a/cypress.env.template.json b/cypress.env.template.json index 59cf04ab6..bd03f6381 100644 --- a/cypress.env.template.json +++ b/cypress.env.template.json @@ -1,4 +1,5 @@ { + "SEED_SERVER_HOST": "http://localhost:4001", "NEO4J_URI": "bolt://localhost:7687", "NEO4J_USERNAME": "neo4j", "NEO4J_PASSWORD": "letmein" diff --git a/cypress/support/factories.js b/cypress/support/factories.js index db31d5866..95355f414 100644 --- a/cypress/support/factories.js +++ b/cypress/support/factories.js @@ -8,13 +8,14 @@ const neo4jDriver = getDriver({ password: Cypress.env('NEO4J_PASSWORD') }) const factory = Factory({ neo4jDriver }) +const seedServerHost = Cypress.env('SEED_SERVER_HOST') beforeEach(async () => { - await factory.cleanDatabase({ neo4jDriver }) + await factory.cleanDatabase({ seedServerHost, neo4jDriver }) }) Cypress.Commands.add('factory', () => { - return Factory() + return Factory({seedServerHost}) }) Cypress.Commands.add( diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml index ced9719a2..8bd536a7b 100644 --- a/docker-compose.travis.yml +++ b/docker-compose.travis.yml @@ -5,3 +5,5 @@ services: build: context: . target: build-and-test + environment: + - BACKEND_URL=http://backend:4123