summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorAlexander Early <alexander.early@gmail.com>2015-07-19 23:18:05 -0700
committerAlexander Early <alexander.early@gmail.com>2015-07-19 23:18:05 -0700
commit2dae7878ef485d40bd14eef4b5be70a246633659 (patch)
treeaa6257eabada26ecbe9201a8884d239331e49d07 /package.json
parent4101af3f402008ea82c8de38ec3bd852aa3d7565 (diff)
parent7e3fcfc2cd505ff2fcc5c4f3f08ea8a8ae8e90b5 (diff)
downloadasync-2dae7878ef485d40bd14eef4b5be70a246633659.tar.gz
Merge pull request #849 from charlierudolph/cr-splitTests
convert tests to mocha
Diffstat (limited to 'package.json')
-rw-r--r--package.json13
1 files changed, 12 insertions, 1 deletions
diff --git a/package.json b/package.json
index 4028e48..d0021ae 100644
--- a/package.json
+++ b/package.json
@@ -21,12 +21,19 @@
"devDependencies": {
"benchmark": "bestiejs/benchmark.js",
"bluebird": "^2.9.32",
+ "chai": "^3.1.0",
"coveralls": "^2.11.2",
"es6-promise": "^2.3.0",
"jscs": "^1.13.1",
"jshint": "~2.8.0",
+ "karma": "^0.13.2",
+ "karma-browserify": "^4.2.1",
+ "karma-firefox-launcher": "^0.1.6",
+ "karma-mocha": "^0.2.0",
+ "karma-mocha-reporter": "^1.0.2",
"lodash": "^3.9.0",
"mkdirp": "~0.5.1",
+ "mocha": "^2.2.5",
"native-promise-only": "^0.8.0-a",
"nodeunit": ">0.0.0",
"nyc": "^2.1.0",
@@ -47,7 +54,11 @@
]
},
"scripts": {
- "test": "npm run-script lint && nodeunit test/test-async.js",
+ "mocha-node-test": "mocha mocha_test/",
+ "mocha-browser-test": "karma start",
+ "mocha-test": "npm run mocha-node-test && npm run mocha-browser-test",
+ "nodeunit-test": "nodeunit test/test-async.js",
+ "test": "npm run-script lint && npm run nodeunit-test && npm run mocha-test",
"lint": "jshint lib/*.js test/*.js perf/*.js && jscs lib/*.js test/*.js perf/*.js",
"coverage": "nyc npm test && nyc report",
"coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"