diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-07-26 09:07:02 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-07-26 09:07:02 +0800 |
| commit | 0ae5305822b86e43c7921c53456a4042b4bc8af6 (patch) | |
| tree | e929a191704b072653b7abf582d9b40a8d5248b7 /package.json | |
| parent | 950e7d3dcc318fd688040008575fe4b1fd6b7de2 (diff) | |
| parent | 11dfb8e869d425204512b250b00ef71ed85a14cc (diff) | |
| download | tangerine-wallet-browser-0ae5305822b86e43c7921c53456a4042b4bc8af6.tar tangerine-wallet-browser-0ae5305822b86e43c7921c53456a4042b4bc8af6.tar.gz tangerine-wallet-browser-0ae5305822b86e43c7921c53456a4042b4bc8af6.tar.bz2 tangerine-wallet-browser-0ae5305822b86e43c7921c53456a4042b4bc8af6.tar.lz tangerine-wallet-browser-0ae5305822b86e43c7921c53456a4042b4bc8af6.tar.xz tangerine-wallet-browser-0ae5305822b86e43c7921c53456a4042b4bc8af6.tar.zst tangerine-wallet-browser-0ae5305822b86e43c7921c53456a4042b4bc8af6.zip | |
Merge branch 'master' into usd-conversion
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/package.json b/package.json index eb3a3b09e..ef570fb94 100644 --- a/package.json +++ b/package.json @@ -5,10 +5,13 @@ "private": true, "scripts": { "start": "gulp dev", - "test": "mocha --require test/helper.js --compilers js:babel-register --recursive", - "watch": "mocha watch --compilers js:babel-register --recursive", + "test": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\" && npm run ci", + "watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"", "ui": "node development/genStates.js && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", - "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./" + "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", + "buildMock": "browserify ./mock-dev.js -o ./development/bundle.js", + "testem": "npm run buildMock && testem", + "ci": "npm run buildMock && testem ci -P 2" }, "browserify": { "transform": [ @@ -96,6 +99,7 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^1.1.5", "qs": "^6.2.0", + "qunit": "^0.9.1", "sinon": "^1.17.3", "tape": "^4.5.1", "uglifyify": "^3.0.1", |