diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-06-02 00:14:17 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-06-02 00:14:17 +0800 |
| commit | acb8a6c55ee2c97db5d738621929feea759465b3 (patch) | |
| tree | 57cfa925d645cb11bb1731381be56d0f66f8f0f1 /package.json | |
| parent | ecf92a4ad786a324d4c8ce9dba926f377766a144 (diff) | |
| parent | 389c18e98e2b5663b1732d7c34f9b21afef66e44 (diff) | |
| download | dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.gz dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.bz2 dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.lz dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.xz dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.tar.zst dexon-sol-tools-acb8a6c55ee2c97db5d738621929feea759465b3.zip | |
Merge branch 'fillOrderAsync' into unavailableFilledCancelled
# Conflicts:
# src/contract_wrappers/exchange_wrapper.ts
# src/types.ts
# src/utils/assert.ts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/package.json b/package.json index 6051759ea..8b472f2a9 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "scripts": { "prebuild": "npm run clean", "build": "run-p build:*:prod", - "lint": "tslint src/**/*.ts", + "lint": "tslint src/*.ts test/*.ts", "test": "run-s clean test:commonjs", "test:umd": "run-s substitute_umd_bundle run_mocha; npm run clean", "test:coverage": "nyc npm run test --all", @@ -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", @@ -46,8 +46,6 @@ }, "devDependencies": { "@types/bignumber.js": "^4.0.2", - "@types/chai": "^3.5.2", - "@types/chai-as-promised": "0.0.30", "@types/jsonschema": "^1.1.1", "@types/lodash": "^4.14.64", "@types/mocha": "^2.2.41", @@ -57,8 +55,11 @@ "bignumber.js": "^4.0.2", "chai": "^3.5.0", "chai-as-promised": "^6.0.0", + "chai-as-promised-typescript-typings": "0.0.2", "chai-bignumber": "^2.0.0", + "chai-typescript-typings": "^0.0.0", "copyfiles": "^1.2.0", + "dirty-chai": "^1.2.2", "ethereumjs-testrpc": "3.0.5", "json-loader": "^0.5.4", "mocha": "^3.4.1", |