diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-09-20 01:45:51 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-09-20 01:45:51 +0800 |
| commit | 90482934f105deeaa32271dac06271f4d6a0bf52 (patch) | |
| tree | bf281edb54e920e008c3f28f57efac4d3324c6c7 /package.json | |
| parent | bfd75107f11995e0636def0e1efa6dd14b3ee8a6 (diff) | |
| parent | 166bd55a43125796521f7caf97c2e2baf3519b36 (diff) | |
| download | tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.tar tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.tar.gz tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.tar.bz2 tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.tar.lz tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.tar.xz tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.tar.zst tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.zip | |
Merge branch 'master' into breakout-mascara
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index 4da6d99a7..a7f52abee 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 --require test/helper.js --recursive \"test/unit/**/*.js\"", "test:single": "METAMASK_ENV=test mocha --require test/helper.js", - "test:integration": "npm run test:flat", + "test:integration": "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", |