diff options
author | Dan Finlay <dan@danfinlay.com> | 2018-03-08 05:39:44 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2018-03-08 05:39:44 +0800 |
commit | d0ba2d2d9428f13208ea54e9fa78f122ed42549b (patch) | |
tree | 7786903649241ab688b5622719cae34f804abef7 /package.json | |
parent | 423f084cb47d84e2e9063a6567454f83592f424b (diff) | |
parent | ca047b1ea0bd6778fc3b0c05b86ff23d0964f98d (diff) | |
download | tangerine-wallet-browser-d0ba2d2d9428f13208ea54e9fa78f122ed42549b.tar.gz tangerine-wallet-browser-d0ba2d2d9428f13208ea54e9fa78f122ed42549b.tar.zst tangerine-wallet-browser-d0ba2d2d9428f13208ea54e9fa78f122ed42549b.zip |
Merge branch 'master' into i3076-UseStorageLocalInstead
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index e0b88e787..44502da98 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "dist": "npm run dist:clear && npm install && gulp dist", "dist:clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect", "test": "npm run lint && npm run test:coverage && npm run test:integration", - "test:unit": "METAMASK_ENV=test mocha --exit --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"", + "test:unit": "METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"", "test:single": "METAMASK_ENV=test mocha --require test/helper.js", "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara", "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload", @@ -223,7 +223,7 @@ "jsdom": "^11.1.0", "jsdom-global": "^3.0.2", "jshint-stylish": "~2.2.1", - "karma": "^1.7.1", + "karma": "^2.0.0", "karma-chrome-launcher": "^2.2.0", "karma-cli": "^1.0.1", "karma-firefox-launcher": "^1.0.1", |