mirror of https://github.com/vector-im/riot-web
Merge pull request #1210 from matrix-org/t3chguy/test-crossplatform
use npm scripts arg passing instead of $KARMAFLAGS to make cross-compatpull/21833/head
commit
30ef6d4932
|
@ -2,7 +2,6 @@
|
|||
|
||||
set -e
|
||||
|
||||
export KARMAFLAGS="--no-colors"
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
|
||||
nvm use 4
|
||||
|
@ -16,7 +15,7 @@ npm install
|
|||
(cd node_modules/matrix-js-sdk && npm install)
|
||||
|
||||
# run the mocha tests
|
||||
npm run test
|
||||
npm run test -- --no-colors
|
||||
|
||||
# run eslint
|
||||
npm run lintall -- -f checkstyle -o eslint.xml || true
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
"lintall": "eslint src/ test/",
|
||||
"clean": "rimraf lib",
|
||||
"prepublish": "npm run build && git rev-parse HEAD > git-revision.txt",
|
||||
"test": "karma start $KARMAFLAGS --single-run=true --browsers ChromeHeadless",
|
||||
"test-multi": "karma start $KARMAFLAGS"
|
||||
"test": "karma start --single-run=true --browsers ChromeHeadless",
|
||||
"test-multi": "karma start"
|
||||
},
|
||||
"dependencies": {
|
||||
"babel-runtime": "^6.11.6",
|
||||
|
|
Loading…
Reference in New Issue