aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-05-29 18:19:50 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-05-29 18:19:50 +0800
commit144456503ce2ff476c050f88af30e3a5f07f907e (patch)
tree464aa56672001b530cc8373f201df0621623318d
parentb08855985066467e16a1ecc7cf2624ebbb6f68ad (diff)
downloaddexon-sol-tools-144456503ce2ff476c050f88af30e3a5f07f907e.tar
dexon-sol-tools-144456503ce2ff476c050f88af30e3a5f07f907e.tar.gz
dexon-sol-tools-144456503ce2ff476c050f88af30e3a5f07f907e.tar.bz2
dexon-sol-tools-144456503ce2ff476c050f88af30e3a5f07f907e.tar.lz
dexon-sol-tools-144456503ce2ff476c050f88af30e3a5f07f907e.tar.xz
dexon-sol-tools-144456503ce2ff476c050f88af30e3a5f07f907e.tar.zst
dexon-sol-tools-144456503ce2ff476c050f88af30e3a5f07f907e.zip
Make eventually a PromisedAssertion
-rw-r--r--src/globals.d.ts3
-rw-r--r--webpack.config.js4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/globals.d.ts b/src/globals.d.ts
index dee957f2f..4c9adcd48 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -15,7 +15,8 @@ declare interface Schema {
declare namespace Chai {
interface Assertion {
bignumber: Assertion;
- eventually: Assertion;
+ // HACK: In order t comply with chai-as-promised we make eventually a PromisedAssertion not an assertion
+ eventually: PromisedAssertion;
}
}
/* tslint:enable */
diff --git a/webpack.config.js b/webpack.config.js
index 67af51f7a..7b7b10b52 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,8 +6,8 @@ const path = require('path');
module.exports = {
entry: {
- '0x': './src/ts/0x.js.ts',
- '0x.min': './src/ts/0x.js.ts'
+ '0x': './src/0x.js.ts',
+ '0x.min': './src/0x.js.ts'
},
output: {
path: path.resolve(__dirname, '_bundles'),