merge development

5 files changed, 5 insertions, 0 deletions

diff --git a/packages/order-watcher/test/event_watcher_test.ts b/packages/order-watcher/test/event_watcher_test.ts
index b4eca315e..ba77d50dd 100644
--- a/packages/order-watcher/test/event_watcher_test.ts
+++ b/packages/order-watcher/test/event_watcher_test.ts
@@ -3,6 +3,7 @@ import { DoneCallback, LogEntry, LogEntryEvent } from '@0xproject/types';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
+import 'make-promises-safe';
 import 'mocha';
 import * as Sinon from 'sinon';
 
diff --git a/packages/order-watcher/test/expiration_watcher_test.ts b/packages/order-watcher/test/expiration_watcher_test.ts
index 0a2524d78..8b006f58a 100644
--- a/packages/order-watcher/test/expiration_watcher_test.ts
+++ b/packages/order-watcher/test/expiration_watcher_test.ts
@@ -6,6 +6,7 @@ import { DoneCallback, Token } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
+import 'make-promises-safe';
 import 'mocha';
 import * as Sinon from 'sinon';
 
diff --git a/packages/order-watcher/test/global_hooks.ts b/packages/order-watcher/test/global_hooks.ts
index 53b3ef545..03eab0e13 100644
--- a/packages/order-watcher/test/global_hooks.ts
+++ b/packages/order-watcher/test/global_hooks.ts
@@ -1,5 +1,6 @@
 import { devConstants } from '@0xproject/dev-utils';
 import { runMigrationsAsync } from '@0xproject/migrations';
+import 'make-promises-safe';
 import * as path from 'path';
 
 import { constants } from './utils/constants';
diff --git a/packages/order-watcher/test/order_watcher_test.ts b/packages/order-watcher/test/order_watcher_test.ts
index 8c9249f58..dc8e544b1 100644
--- a/packages/order-watcher/test/order_watcher_test.ts
+++ b/packages/order-watcher/test/order_watcher_test.ts
@@ -15,6 +15,7 @@ import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
+import 'make-promises-safe';
 import 'mocha';
 
 import { OrderWatcher } from '../src/order_watcher/order_watcher';
diff --git a/packages/order-watcher/test/remaining_fillable_calculator_test.ts b/packages/order-watcher/test/remaining_fillable_calculator_test.ts
index 7ec3f1ebc..ea116175b 100644
--- a/packages/order-watcher/test/remaining_fillable_calculator_test.ts
+++ b/packages/order-watcher/test/remaining_fillable_calculator_test.ts
@@ -2,6 +2,7 @@ import { ECSignature, SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
+import 'make-promises-safe';
 import 'mocha';
 
 import { RemainingFillableCalculator } from '@0xproject/order-utils';