diff options
| author | kumavis <aaron@kumavis.me> | 2017-09-14 07:45:31 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-09-14 07:45:31 +0800 |
| commit | 56db3999adeaec1733218173b260bf74fa63ccbe (patch) | |
| tree | 4a85497ce8bbed94935b695283a379686b390212 /package.json | |
| parent | dd90e8e364a7023431be081d293d10129b76422c (diff) | |
| download | tangerine-wallet-browser-56db3999adeaec1733218173b260bf74fa63ccbe.tar.gz tangerine-wallet-browser-56db3999adeaec1733218173b260bf74fa63ccbe.tar.zst tangerine-wallet-browser-56db3999adeaec1733218173b260bf74fa63ccbe.zip | |
tests - start migrating mascara tests to karma
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 d618983bd..8ba6e16cb 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "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 && karma start", + "test-integration": "npm run buildMock && npm run buildCiUnits && karma start test/together.conf.js", "test-coverage": "nyc npm run test-unit && npm run coveralls-upload", "coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi", "ci": "npm run lint && npm run test-coverage && npm run test-integration", @@ -27,10 +27,11 @@ "generateNotice": "node notices/notice-generator.js", "deleteNotice": "node notices/notice-delete.js", "mascara": "node ./mascara/example/server", - "buildMascaraCi": "browserify mascara/test/window-load.js -o mascara/test/bundle.js", - "buildMascaraSWCi": "browserify mascara/src/background.js -o mascara/test/background.js", - "mascaraCi": "npm run buildMascaraCi && npm run buildMascaraSWCi && node mascara/test/index.js", - "testMascara": "cd mascara/test && npm run mascaraCi && testem ci -P 3" + "testMascara": "npm run buildMascara && karma start test/mascara.conf.js", + "buildMascara": "npm run buildMascaraUi && npm run buildMascaraBackground && npm run buildMascaraTests", + "buildMascaraUi": "browserify mascara/test/test-ui.js -o mascara/test/ui-bundle.js", + "buildMascaraBackground": "browserify mascara/src/background.js -o mascara/test/background.js", + "buildMascaraTests": "browserify test/integration/lib/first-time.js -o mascara/test/test-bundle.js" }, "browserify": { "transform": [ |