aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-11-08 01:29:47 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-11-08 01:29:47 +0800
commit08867874ccea02dab9755ba6b0fc4221bb1dbf00 (patch)
tree5b2b893c4c00a14daa9724ba28ff7dc8f504ea10 /package.json
parenta89b682dec350218b2d753d6cfb196f965acdde2 (diff)
parentacc973d543ac65f8db980c0007c248c509345411 (diff)
downloadtangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar
tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.gz
tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.bz2
tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.lz
tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.xz
tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.zst
tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.zip
Merge remote-tracking branch 'origin/uat' into mascara-first-screen
Diffstat (limited to 'package.json')
-rw-r--r--package.json4
1 files changed, 3 insertions, 1 deletions
diff --git a/package.json b/package.json
index 81d1c9674..fae0881b8 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"test": "npm run lint && npm run test:coverage && npm run test:integration",
"test:unit": "METAMASK_ENV=test mocha --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
"test:single": "METAMASK_ENV=test mocha --require test/helper.js",
- "test:integration": "npm run test:flat && npm run test:mascara",
+ "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",
"test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
"test:flat": "npm run test:flat:build && karma start test/flat.conf.js",
@@ -190,6 +190,7 @@
"enzyme": "^2.8.2",
"eslint-plugin-chai": "0.0.1",
"eslint-plugin-mocha": "^4.9.0",
+ "eslint-plugin-react": "^7.4.0",
"eth-json-rpc-middleware": "^1.2.7",
"fs-promise": "^2.0.3",
"gulp": "github:gulpjs/gulp#4.0",
@@ -226,6 +227,7 @@
"react-addons-test-utils": "^15.5.1",
"react-test-renderer": "^15.5.4",
"react-testutils-additions": "^15.2.0",
+ "redux-test-utils": "^0.1.3",
"sinon": "^4.0.0",
"stylelint-config-standard": "^17.0.0",
"tape": "^4.5.1",