OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1210 from matrix-org/t3chguy/test-crossplatform 

use npm scripts arg passing instead of $KARMAFLAGS to make cross-compat
pull/21833/head
Richard van der Hoff 2017-07-11 23:18:53 +01:00 committed by GitHub
parent 569ea909c4 7473c654d5
commit 30ef6d4932
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins.sh
View File

@ -2,7 +2,6 @@
set -e set -e
export KARMAFLAGS="--no-colors"
export NVM_DIR="$HOME/.nvm" export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
nvm use 4 nvm use 4
@ -16,7 +15,7 @@ npm install
(cd node_modules/matrix-js-sdk && npm install) (cd node_modules/matrix-js-sdk && npm install)
# run the mocha tests # run the mocha tests
npm run test npm run test -- --no-colors
# run eslint # run eslint
npm run lintall -- -f checkstyle -o eslint.xml || true npm run lintall -- -f checkstyle -o eslint.xml || true

4
package.json
View File

@ -41,8 +41,8 @@
"lintall": "eslint src/ test/", "lintall": "eslint src/ test/",
"clean": "rimraf lib", "clean": "rimraf lib",
"prepublish": "npm run build && git rev-parse HEAD > git-revision.txt", "prepublish": "npm run build && git rev-parse HEAD > git-revision.txt",
"test": "karma start $KARMAFLAGS --single-run=true --browsers ChromeHeadless", "test": "karma start --single-run=true --browsers ChromeHeadless",
"test-multi": "karma start $KARMAFLAGS" "test-multi": "karma start"
}, },
"dependencies": { "dependencies": {
"babel-runtime": "^6.11.6", "babel-runtime": "^6.11.6",