Merge pull request #8 from nestjsx/develop

Develop
nestjsx · Dec 17, 2018 · 788a2d1 · 788a2d1
2 parents fb36500 + 1df06b5
commit 788a2d1
Show file tree

Hide file tree

Showing 179 changed files with 17,813 additions and 9,706 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # dependencies
 /node_modules
+integration/**/node_modules
 yarn-error.log
 npm-debug.log
 

diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,4 +1,5 @@
 {
+  "printWidth": 100,
   "singleQuote": true,
   "trailingComma": "all",
   "arrowParens": "always"

diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,26 @@
 language: node_js
 
 node_js:
- - "8"
- - "9"
- - "10"
+  - '10'
+
+env:
+  - DOCKER_COMPOSE_VERSION=1.23.1
+
+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
 
 before_script:
- - npm i -g npm@latest
+  - npm i -g npm@latest
 
 install:
- - npm i
+  - docker-compose up -d
+  - cd integration/typeorm
+  - npm i
+  - cd ../../
+  - npm i
 
 script:
- - npm test
- - npm run test:e2e
-
-after_success: npm run coverage
+  - npm run test:e2e | coveralls