Skip to content

Commit

Permalink
Merge pull request RocketChat#229 from assistify/feature/RocketChat#228
Browse files Browse the repository at this point in the history
…-run-tests-separately

Run tests separately
  • Loading branch information
ThomasRoehl authored Feb 16, 2018
2 parents 75f78c8 + 2990cd7 commit 6c574db
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .scripts/seperateTesting.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ tmpPath=tests/end-to-end/temporary_staged_test
rm -rf $tmpPath
mkdir -p $tmpPath
[ -z "$retry_test" ] && retry_test=1
for file in tests/end-to-end/api/*.js; do

for file in tests/end-to-end/*/*.js; do
failed=1
for i in `seq 1 $retry_test`; do
echo '-------------- '$i' try ---------------'
Expand Down
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ before_script:
- mongo --eval 'rs.status()'
- mongo meteor --eval 'db.getCollectionNames()'
script:
- travis_retry npm test
- retry_test=3 .scripts/seperateTesting.sh
- mongo meteor --eval 'db.dropDatabase()'
- unset MONGO_OPLOG_URL
- travis_retry npm test
- retry_test=3 .scripts/seperateTesting.sh
#before_deploy:
#- source ".travis/setartname.sh"
#- source ".travis/setdeploydir.sh"
Expand Down Expand Up @@ -107,8 +107,3 @@ env:
- MONGO_OPLOG_URL: "mongodb://localhost:27017/local"
- MONGO_URL: "mongodb://localhost:27017/meteor"
- TEST_MODE: "true"
- OVERWRITE_SETTING_Assistify_AI_Smarti_Domain: testclient
- OVERWRITE_SETTING_Assistify_AI_Source: 0
- OVERWRITE_SETTING_Assistify_AI_Enabled: true
- OVERWRITE_SETTING_Assistify_AI_RocketChat_Webhook_Token: key123
- OVERWRITE_SETTING_Assistify_AI_Smarti_Base_URL: http://localhost:8080/

0 comments on commit 6c574db

Please sign in to comment.