aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2015-01-12 00:54:36 +0800
committerGav Wood <i@gavwood.com>2015-01-12 00:54:36 +0800
commitded221fba2cc21e1037a1130d9d142e657a52e89 (patch)
tree48d0c2871eafec7049d0f5c04b24db8d0f91df3f /package.json
parent47687cf085196e2e4fa7ec42ff426f241dae10c5 (diff)
downloadgo-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.tar.gz
go-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.tar.zst
go-tangerine-ded221fba2cc21e1037a1130d9d142e657a52e89.zip
Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop
Conflicts: libjsqrc/ethereumjs/.travis.yml libjsqrc/ethereumjs/README.md libjsqrc/ethereumjs/dist/ethereum.js libjsqrc/ethereumjs/dist/ethereum.js.map libjsqrc/ethereumjs/lib/abi.js libjsqrc/ethereumjs/package.json
Diffstat (limited to 'package.json')
-rw-r--r--package.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/package.json b/package.json
index fc34be487..b4f180d10 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,14 @@
"jshint": ">=2.5.0",
"uglifyify": "^2.6.0",
"unreachable-branch-transform": "^0.1.0",
- "vinyl-source-stream": "^1.0.0"
+ "vinyl-source-stream": "^1.0.0",
+ "mocha": ">=2.1.0"
},
"scripts": {
"build": "gulp",
"watch": "gulp watch",
- "lint": "gulp lint"
+ "lint": "gulp lint",
+ "test": "mocha"
},
"repository": {
"type": "git",