diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2017-09-13 02:30:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 02:30:23 +0800 |
| commit | 8d945d3fa0f43f02ca4375ad6ee46e4a5d3ea5e6 (patch) | |
| tree | 2c9401f6c52c5522e11af409f59572f607d0b260 /package.json | |
| parent | 08f227607ae4a9c476ebac4218c7573d53f90697 (diff) | |
| parent | 22c7049f6c195e0b3775a1aa78f92fdbe2ac2559 (diff) | |
| download | tangerine-wallet-browser-8d945d3fa0f43f02ca4375ad6ee46e4a5d3ea5e6.tar tangerine-wallet-browser-8d945d3fa0f43f02ca4375ad6ee46e4a5d3ea5e6.tar.gz tangerine-wallet-browser-8d945d3fa0f43f02ca4375ad6ee46e4a5d3ea5e6.tar.bz2 tangerine-wallet-browser-8d945d3fa0f43f02ca4375ad6ee46e4a5d3ea5e6.tar.lz tangerine-wallet-browser-8d945d3fa0f43f02ca4375ad6ee46e4a5d3ea5e6.tar.xz tangerine-wallet-browser-8d945d3fa0f43f02ca4375ad6ee46e4a5d3ea5e6.tar.zst tangerine-wallet-browser-8d945d3fa0f43f02ca4375ad6ee46e4a5d3ea5e6.zip | |
Merge pull request #2069 from MetaMask/integration-tests-fix2
Integration test improvements
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 9afc181a3..9d267bde6 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,8 @@ "test": "npm run lint && npm run test-unit && npm run test-integration", "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"", "single-test": "METAMASK_ENV=test mocha --require test/helper.js", - "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", - "test-coverage": "nyc npm run test-unit && nyc report --reporter=text-lcov | coveralls", + "test-integration": "npm run buildMock && npm run buildCiUnits && karma start", + "test-coverage": "nyc npm run test-unit && if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi", "ci": "npm run lint && npm run test-coverage && npm run test-integration", "lint": "gulp lint", "buildCiUnits": "node test/integration/index.js", @@ -22,7 +22,6 @@ "ui": "npm run genStates && 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 ./", "buildMock": "npm run genStates && browserify ./mock-dev.js -o ./development/bundle.js", - "testem": "npm run buildMock && testem", "announce": "node development/announcer.js", "generateNotice": "node notices/notice-generator.js", "deleteNotice": "node notices/notice-delete.js", @@ -172,6 +171,11 @@ "jsdom-global": "^3.0.2", "jshint-stylish": "~2.2.1", "json-rpc-engine": "^3.0.1", + "karma": "^1.7.1", + "karma-chrome-launcher": "^2.2.0", + "karma-cli": "^1.0.1", + "karma-firefox-launcher": "^1.0.1", + "karma-qunit": "^1.2.1", "lodash.assign": "^4.0.6", "mocha": "^3.4.2", "mocha-eslint": "^4.0.0", |