aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-07-23 08:09:50 +0800
committerDan Finlay <dan@danfinlay.com>2016-07-23 08:09:50 +0800
commit5476cb9a2c37ddff470e46738cb1eb9fb34172b1 (patch)
tree3357a7b824bce625ad96fbd470c41855f1f8268f
parent6b3ffc9e5da638bc29bc5ae5c50a58c48198bd55 (diff)
downloadtangerine-wallet-browser-5476cb9a2c37ddff470e46738cb1eb9fb34172b1.tar
tangerine-wallet-browser-5476cb9a2c37ddff470e46738cb1eb9fb34172b1.tar.gz
tangerine-wallet-browser-5476cb9a2c37ddff470e46738cb1eb9fb34172b1.tar.bz2
tangerine-wallet-browser-5476cb9a2c37ddff470e46738cb1eb9fb34172b1.tar.lz
tangerine-wallet-browser-5476cb9a2c37ddff470e46738cb1eb9fb34172b1.tar.xz
tangerine-wallet-browser-5476cb9a2c37ddff470e46738cb1eb9fb34172b1.tar.zst
tangerine-wallet-browser-5476cb9a2c37ddff470e46738cb1eb9fb34172b1.zip
Correct skip usage
-rw-r--r--package.json2
-rw-r--r--testem.yml5
2 files changed, 4 insertions, 3 deletions
diff --git a/package.json b/package.json
index 951e50651..ef570fb94 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
"buildMock": "browserify ./mock-dev.js -o ./development/bundle.js",
"testem": "npm run buildMock && testem",
- "ci": "npm run buildMock && testem ci -P 5"
+ "ci": "npm run buildMock && testem ci -P 2"
},
"browserify": {
"transform": [
diff --git a/testem.yml b/testem.yml
index 4167fff4a..7923a2929 100644
--- a/testem.yml
+++ b/testem.yml
@@ -1,8 +1,9 @@
launch_in_dev:
- Chrome
- Firefox
-skip:
- - PhantomJS
+launch_in_ci:
+ - Chrome
+ - Firefox
framework:
- qunit
test_page: "test/integration/index.html"