diff options
| author | Frankie <frankie.diamond@gmail.com> | 2017-03-31 09:54:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 09:54:58 +0800 |
| commit | 242ba6e0ecc8628288ca5a80c8c6183675030b1b (patch) | |
| tree | 07b2b5cef8163648bc80c12476c9928f08cb4b3f /package.json | |
| parent | 738201e8e5d829282363dda4bc0480dec7245f4a (diff) | |
| parent | 47ea5452414ef4c126ff6c6ccb40615f852f8bed (diff) | |
| download | tangerine-wallet-browser-242ba6e0ecc8628288ca5a80c8c6183675030b1b.tar tangerine-wallet-browser-242ba6e0ecc8628288ca5a80c8c6183675030b1b.tar.gz tangerine-wallet-browser-242ba6e0ecc8628288ca5a80c8c6183675030b1b.tar.bz2 tangerine-wallet-browser-242ba6e0ecc8628288ca5a80c8c6183675030b1b.tar.lz tangerine-wallet-browser-242ba6e0ecc8628288ca5a80c8c6183675030b1b.tar.xz tangerine-wallet-browser-242ba6e0ecc8628288ca5a80c8c6183675030b1b.tar.zst tangerine-wallet-browser-242ba6e0ecc8628288ca5a80c8c6183675030b1b.zip | |
Merge pull request #1298 from MetaMask/tests-fix
Test Framework Fix
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/package.json b/package.json index 9e04bc6f7..7dfe21f24 100644 --- a/package.json +++ b/package.json @@ -5,20 +5,20 @@ "private": true, "scripts": { "start": "npm run dev", - "lint": "gulp lint", - "buildCiUnits": "node test/integration/index.js", "dev": "gulp dev --debug", "disc": "gulp disc --debug", "dist": "gulp dist --disableLiveReload", - "test": "npm run lint && npm run fastTest && npm run ci", - "fastTest": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"", + "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\"", + "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", + "lint": "gulp lint", + "buildCiUnits": "node test/integration/index.js", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", "genStates": "node development/genStates.js", "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", - "ci": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", "announce": "node development/announcer.js", "generateNotice": "node notices/notice-generator.js", "deleteNotice": "node notices/notice-delete.js" @@ -40,6 +40,7 @@ "async": "^1.5.2", "async-q": "^0.3.1", "bip39": "^2.2.0", + "bluebird": "^3.5.0", "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", "clone": "^1.0.2", |