Merge branch 'master' into roschaefer-patch-1

This commit is contained in:
Grzegorz Leoniec 2018-12-15 13:12:59 +01:00 committed by GitHub
commit 1c9521bf34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,7 +22,7 @@ install:
- docker-compose -f docker-compose.yml up -d
- git clone https://github.com/Human-Connection/Nitro-Backend.git ../Nitro-Backend
- git -C "../Nitro-Backend" checkout $TRAVIS_BRANCH || echo "Branch \`$TRAVIS_BRANCH\` does not exist, falling back to \`master\`"
- docker-compose -f ../Nitro-Backend/docker-compose.yml up -d
- docker-compose -f ../Nitro-Backend/docker-compose.yml -f ../Nitro-Backend/docker-compose.travis.yml up -d
- yarn global add cypress wait-on
- yarn add cypress-cucumber-preprocessor