From 144456503ce2ff476c050f88af30e3a5f07f907e Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 29 May 2017 12:19:50 +0200
Subject: Make eventually a PromisedAssertion

---
 src/globals.d.ts  | 3 ++-
 webpack.config.js | 4 ++--
 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'),
-- 
cgit v1.2.3