Merge branch 'dev' into feature/19-user_seeding
All checks were successful
continuous-integration/drone/pr Build is passing
All checks were successful
continuous-integration/drone/pr Build is passing
# Conflicts: # package.json
This commit is contained in:
commit
10640f40aa
20
.drone.yml
Normal file
20
.drone.yml
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
name: tests:latest
|
||||||
|
clone:
|
||||||
|
disable: true
|
||||||
|
steps:
|
||||||
|
- name: checkout pr
|
||||||
|
image: alpine/git
|
||||||
|
commands:
|
||||||
|
- git clone $DRONE_REMOTE_URL .
|
||||||
|
- git checkout $DRONE_SOURCE_BRANCH
|
||||||
|
- mv .env.ci .env
|
||||||
|
- name: run tests
|
||||||
|
image: node:alpine
|
||||||
|
commands:
|
||||||
|
- yarn
|
||||||
|
- yarn test:ci
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- pull_request
|
8
.env.ci
Normal file
8
.env.ci
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
APP_PORT=4010
|
||||||
|
DB_TYPE=sqlite
|
||||||
|
DB_HOST=unused
|
||||||
|
DB_PORT=unused
|
||||||
|
DB_USER=unused
|
||||||
|
DB_PASSWORD=bla
|
||||||
|
DB_NAME=./test.sqlite
|
||||||
|
NODE_ENV=production
|
18
package.json
18
package.json
@ -49,13 +49,19 @@
|
|||||||
"@types/cors": "^2.8.8",
|
"@types/cors": "^2.8.8",
|
||||||
"@types/dotenv": "^8.2.0",
|
"@types/dotenv": "^8.2.0",
|
||||||
"@types/express": "^4.17.9",
|
"@types/express": "^4.17.9",
|
||||||
|
"@types/jest": "^26.0.16",
|
||||||
"@types/jsonwebtoken": "^8.5.0",
|
"@types/jsonwebtoken": "^8.5.0",
|
||||||
"@types/multer": "^1.4.4",
|
"@types/multer": "^1.4.4",
|
||||||
"@types/node": "^14.14.9",
|
"@types/node": "^14.14.9",
|
||||||
"@types/swagger-ui-express": "^4.1.2",
|
"@types/swagger-ui-express": "^4.1.2",
|
||||||
"@types/uuid": "^8.3.0",
|
"@types/uuid": "^8.3.0",
|
||||||
|
"axios": "^0.21.0",
|
||||||
|
"dotenv-safe": "^8.2.0",
|
||||||
|
"jest": "^26.6.3",
|
||||||
"nodemon": "^2.0.6",
|
"nodemon": "^2.0.6",
|
||||||
"sqlite3": "^5.0.0",
|
"sqlite3": "^5.0.0",
|
||||||
|
"start-server-and-test": "^1.11.6",
|
||||||
|
"ts-jest": "^26.4.4",
|
||||||
"ts-node": "^9.0.0",
|
"ts-node": "^9.0.0",
|
||||||
"typedoc": "^0.19.2",
|
"typedoc": "^0.19.2",
|
||||||
"typescript": "^4.1.2"
|
"typescript": "^4.1.2"
|
||||||
@ -64,6 +70,16 @@
|
|||||||
"dev": "nodemon src/app.ts",
|
"dev": "nodemon src/app.ts",
|
||||||
"build": "tsc",
|
"build": "tsc",
|
||||||
"docs": "typedoc --out docs src",
|
"docs": "typedoc --out docs src",
|
||||||
"seed": "ts-node ./node_modules/typeorm-seeding/dist/cli.js seed"
|
"test": "jest",
|
||||||
|
"test:watch": "jest --watchAll",
|
||||||
|
"test:ci": "start-server-and-test dev http://localhost:4010/api/openapi.json test",
|
||||||
|
"seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed"
|
||||||
|
},
|
||||||
|
"nodemonConfig": {
|
||||||
|
"ignore": [
|
||||||
|
"src/tests/*",
|
||||||
|
"docs/*"
|
||||||
|
],
|
||||||
|
"delay": "2500"
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user