Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

travis config fix

Browse Source
This commit is contained in:
SamR1
2018-01-14 14:56:20 +01:00
parent dbc68de5f2
commit 63aefce0ca
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -41,7 +41,7 @@ before_script:
script: script:
- psql -c 'create database mpwo_test;' -U postgres - psql -c 'create database mpwo_test;' -U postgres
- docker-compose -f docker-compose-ci.yml run api flask init_db - docker-compose -f docker-compose-ci.yml run mpwo-api flask init_db
- sh test.sh - sh test.sh
after_script: after_script:

4
docker-compose-ci.yml
View File

@@ -17,8 +17,8 @@ services:
ports: ports:
- 5001:5000 - 5001:5000
environment: environment:
- DATABASE_URL=postgres://postgres:postgres@api-db:5432/mpwo - DATABASE_URL=postgres://postgres:postgres@mpwo-db:5432/mpwo
- DATABASE_TEST_URL=postgres://postgres:postgres@api-db:5432/mpwo_test - DATABASE_TEST_URL=postgres://postgres:postgres@mpwo-db:5432/mpwo_test
- FLASK_APP=server.py - FLASK_APP=server.py
- FLASK_DEBUG=1 - FLASK_DEBUG=1
- APP_SETTINGS=mpwo_api.config.TestingConfig - APP_SETTINGS=mpwo_api.config.TestingConfig

2
test.sh
View File

@@ -8,7 +8,7 @@ inspect() {
fi fi
} }
docker-compose -f docker-compose-ci.yml run api flask test docker-compose -f docker-compose-ci.yml run mpwo-api flask test
inspect $? api inspect $? api
testcafe chrome mpwo_client/e2e testcafe chrome mpwo_client/e2e