merged npm-run-all in

.travis.yml

@@ -7,17 +7,24 @@ cache:
     - node_modules
 services:
   - docker
-  - neo4j
+
+env:
+  - DOCKER_COMPOSE_VERSION=1.23.2
+
+before_install:
+  - sudo rm /usr/local/bin/docker-compose
+  - 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
 
 install:
-  - yarn install
   - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/nitro-backend:latest .
-  - cp .env.template .env
+  - docker-compose up -d
 
 script:
-- docker run humanconnection/nitro-backend:latest yarn run ci
-- yarn run db:reset
-- yarn run db:seed
+  - docker-compose exec backend yarn run ci
+  - docker-compose exec backend yarn run db:reset
+  - docker-compose exec backend yarn run db:seed
 
 after_success:
   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh

package.json

@@ -13,63 +13,59 @@
     "test:coverage": "nyc report --reporter=text-lcov > coverage.lcov",
     "start": "./node_modules/.bin/nodemon --exec babel-node src/index.js",
     "start:debug": "./node_modules/.bin/nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js",
-    "db:script:seed": "wait-on tcp:4001 && $npm_package_config_no_auth ./node_modules/.bin/babel-node src/seed/seed-db.js",
-    "db:script:reset": "wait-on tcp:4001 && $npm_package_config_no_auth ./node_modules/.bin/babel-node src/seed/reset-db.js",
-    "db:seed":  "concurrently --kill-others --success first -n no-auth-server,seed '$npm_package_config_no_auth yarn run start' 'yarn run db:script:seed'",
-    "db:reset": "concurrently --kill-others --success first -n no-auth-server,reset '$npm_package_config_no_auth yarn run start' 'yarn run db:script:reset'"
+    "db:script:seed": "wait-on tcp:4001 && ./node_modules/.bin/babel-node src/seed/seed-db.js",
+    "db:script:reset": "wait-on tcp:4001 && ./node_modules/.bin/babel-node src/seed/reset-db.js",
+    "db:seed": "$npm_package_config_no_auth run-p --race start db:script:seed",
+    "db:reset": "$npm_package_config_no_auth run-p --race start db:script:reset"
   },
   "author": "Human Connection gGmbH",
   "license": "MIT",
   "dependencies": {
-    "@babel/cli": "^7.1.5",
-    "@babel/core": "^7.1.6",
-    "@babel/node": "^7.0.0",
-    "@babel/preset-env": "^7.1.6",
-    "@babel/register": "^7.0.0",
-    "apollo-cache-inmemory": "^1.2.5",
-    "apollo-client": "^2.3.2",
-    "apollo-link-http": "^1.5.4",
-    "apollo-server": "^2.0.4",
-    "bcryptjs": "^2.4.3",
-    "cheerio": "^1.0.0-rc.2",
-    "cross-env": "^5.2.0",
-    "date-fns": "^2.0.0-alpha.24",
-    "dotenv": "^6.2.0",
-    "graphql-custom-directives": "^0.2.13",
-    "graphql-iso-date": "^3.6.1",
-    "graphql-middleware": "1.7.6",
-    "graphql-shield": "^4.0.1",
-    "graphql-tag": "^2.9.2",
-    "graphql-yoga": "1.16.2",
-    "jsonwebtoken": "^8.3.0",
-    "linkifyjs": "^2.1.7",
-    "lodash": "^4.17.11",
-    "ms": "^2.1.1",
-    "neo4j-driver": "^1.6.1",
-    "neo4j-graphql-js": "2.0.1",
-    "node-fetch": "^2.1.2",
-    "passport": "^0.4.0",
-    "passport-jwt": "^4.0.0",
-    "sanitize-html": "^1.19.3",
-    "slug": "^0.9.1",
-    "trunc-html": "^1.1.2"
+    "@babel/cli": "~7.2.0",
+    "@babel/core": "~7.2.0",
+    "@babel/node": "~7.2.0",
+    "@babel/preset-env": "~7.2.0",
+    "@babel/register": "~7.0.0",
+    "apollo-cache-inmemory": "~1.3.11",
+    "apollo-client": "~2.4.7",
+    "apollo-link-http": "~1.5.7",
+    "apollo-server": "~2.2.6",
+    "bcryptjs": "~2.4.3",
+    "cheerio": "~1.0.0-rc.2",
+    "date-fns": "^2.0.0-alpha.25",
+    "dotenv": "~6.2.0",
+    "graphql": "~0.13.0",
+    "graphql-custom-directives": "~0.2.14",
+    "graphql-iso-date": "~3.6.1",
+    "graphql-middleware": "2.0.2",
+    "graphql-shield": "~4.1.0",
+    "graphql-tag": "~2.10.0",
+    "graphql-yoga": "~1.16.7",
+    "jsonwebtoken": "~8.4.0",
+    "linkifyjs": "~2.1.7",
+    "lodash": "~4.17.11",
+    "ms": "~2.1.1",
+    "neo4j-driver": "~1.7.2",
+    "neo4j-graphql-js": "~2.0.1",
+    "node-fetch": "~2.3.0",
+    "passport": "~0.4.0",
+    "passport-jwt": "~4.0.0",
+    "sanitize-html": "~1.19.3",
+    "slug": "~0.9.2",
+    "trunc-html": "~1.1.2"
   },
   "devDependencies": {
-    "apollo-server-testing": "^2.2.2",
-    "babel-eslint": "^10.0.1",
-    "chai": "^4.2.0",
-    "concurrently": "^4.1.0",
-    "cross-env": "^5.2.0",
-    "eslint": "^5.9.0",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^8.0.0",
-    "eslint-plugin-promise": "^4.0.1",
-    "eslint-plugin-standard": "^4.0.0",
-    "faker": "^4.1.0",
-    "mocha": "^5.2.0",
-    "nodemon": "^1.18.7",
-    "nyc": "^13.1.0",
-    "wait-on": "^3.2.0"
+    "babel-eslint": "~10.0.1",
+    "cross-env": "~5.2.0",
+    "eslint": "~5.9.0",
+    "eslint-config-standard": "~12.0.0",
+    "eslint-plugin-import": "~2.14.0",
+    "eslint-plugin-node": "~8.0.0",
+    "eslint-plugin-promise": "~4.0.1",
+    "eslint-plugin-standard": "~4.0.0",
+    "faker": "~4.1.0",
+    "nodemon": "~1.18.7",
+    "npm-run-all": "~4.1.5",
+    "wait-on": "~3.2.0"
   }
 }