Merge branch 'master' into 'moveServiceToDataGroups'
# Conflicts: # src/cloud/config.ts
devops/aws/awstest.yml
0 → 100644
devops/aws/requirements.txt
0 → 100644
... | ... | @@ -14,7 +14,7 @@ |
"setup:dev": "(nohup redis-server > /tmp/redis.log 2>&1 &) && (npm i)", | ||
"test": "env UTEST=true mocha -r ts-node/register tests/utest/test.ts", | ||
"test-coverage": "env UTEST=true nyc mocha -r ts-node/register --reporter mocha-junit-reporter tests/utest/test.ts", | ||
"test-automation": "npm run clean && npm install && npm run test-coverage", | ||
"test-automation": "npm run clean && npm install && npm run build && npm run test-coverage", | ||
"test-e2e-parallel": "node ./tests/e2e/parallel/run_e2e_tests_parallel.js" | ||
}, | ||
"nyc": { | ||
... | ... | @@ -77,7 +77,7 @@ |
"replace-in-file": "^6.1.0", | ||
"request": "2.88.2", | ||
"request-promise": "4.2.6", | ||
"typescript": "^3.8.3", | ||
"typescript": "4.2.3", | ||
"uuid": "^8.3.2", | ||
"winston": "3.3.3", | ||
"xss-filters": "1.2.7", | ||
... | ... |