Merge branch 'master' into fill-order-amuont

1 files changed, 4 insertions, 5 deletions

diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts
index e50a6018c..9ec0a0c8e 100644
--- a/test/0x.js_test.ts
+++ b/test/0x.js_test.ts
@@ -1,5 +1,4 @@
-import each = require('lodash/each');
-import assign = require('lodash/assign');
+import * as _ from 'lodash';
 import * as chai from 'chai';
 import {chaiSetup} from './utils/chai_setup';
 import 'mocha';
@@ -68,7 +67,7 @@ describe('ZeroEx library', () => {
             ).to.become(false);
         });
         it('should return false if the signature doesn\'t pertain to the dataHex & address', async () => {
-            const wrongSignature = assign({}, signature, {v: 28});
+            const wrongSignature = _.assign({}, signature, {v: 28});
             expect(ZeroEx.isValidSignature(dataHex, wrongSignature, address)).to.be.false();
             return expect(
                 (zeroEx.exchange as any)._isValidSignatureUsingContractCallAsync(dataHex, wrongSignature, address),
@@ -145,7 +144,7 @@ describe('ZeroEx library', () => {
         let stubs: Sinon.SinonStub[] = [];
         afterEach(() => {
             // clean up any stubs after the test has completed
-            each(stubs, s => s.restore());
+            _.each(stubs, s => s.restore());
             stubs = [];
         });
         it('calculates the order hash', async () => {
@@ -172,7 +171,7 @@ describe('ZeroEx library', () => {
         });
         afterEach(() => {
             // clean up any stubs after the test has completed
-            each(stubs, s => s.restore());
+            _.each(stubs, s => s.restore());
             stubs = [];
         });
         it ('Should return the correct ECSignature on TestPRC nodeVersion', async () => {