aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-06-01 21:52:11 +0800
committerFabio Berger <me@fabioberger.com>2017-06-01 21:52:11 +0800
commit73ad8378b0b4c2a87fd81cfc7a0193dbf940ff92 (patch)
treebe077e8e1869bdc070401654133c1ac6762bdc98 /package.json
parent6a57c42e253a52a449cae8a5c6565276cb01a86c (diff)
parentd8e35c364ea94b606810b340fb02d8706e257c3c (diff)
downloaddexon-sol-tools-73ad8378b0b4c2a87fd81cfc7a0193dbf940ff92.tar
dexon-sol-tools-73ad8378b0b4c2a87fd81cfc7a0193dbf940ff92.tar.gz
dexon-sol-tools-73ad8378b0b4c2a87fd81cfc7a0193dbf940ff92.tar.bz2
dexon-sol-tools-73ad8378b0b4c2a87fd81cfc7a0193dbf940ff92.tar.lz
dexon-sol-tools-73ad8378b0b4c2a87fd81cfc7a0193dbf940ff92.tar.xz
dexon-sol-tools-73ad8378b0b4c2a87fd81cfc7a0193dbf940ff92.tar.zst
dexon-sol-tools-73ad8378b0b4c2a87fd81cfc7a0193dbf940ff92.zip
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
# Conflicts: # src/contract_wrappers/exchange_wrapper.ts
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index 8cef48c95..8b472f2a9 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"pretest:umd": "run-s clean build:*:dev",
"substitute_umd_bundle": "npm run remove_src_files_not_used_by_tests; shx mv _bundles/* lib/src",
"remove_src_files_not_used_by_tests": "find ./lib/src \\( -path ./lib/src/utils -o -path ./lib/src/schemas -o -path \"./lib/src/types.*\" \\) -prune -o -type f -print | xargs rm",
- "run_mocha": "mocha lib/test/**/*_test.js"
+ "run_mocha": "mocha lib/test/**/*_test.js --timeout 3000"
},
"config": {
"artifacts": "Proxy Exchange TokenRegistry Token Mintable EtherToken",