From 321e0765cb3cee989f5869992209cbd9d69c1c3d Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 6 Jun 2017 15:48:29 +0200 Subject: avoid newline issues by putting the assertion message on a single line --- src/utils/assert.ts | 5 +++-- test/assert_test.ts | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/utils/assert.ts b/src/utils/assert.ts index f4d653ffb..4dc6945a2 100644 --- a/src/utils/assert.ts +++ b/src/utils/assert.ts @@ -34,8 +34,9 @@ export const assert = { async isSenderAddressAvailableAsync(web3Wrapper: Web3Wrapper, variableName: string, senderAddressHex: string): Promise { const isSenderAddressAvailable = await web3Wrapper.isSenderAddressAvailableAsync(senderAddressHex); - assert.assert(isSenderAddressAvailable, `Specified ${variableName} ${senderAddressHex} isn't available \ - through the supplied web3 instance`); + assert.assert(isSenderAddressAvailable, + `Specified ${variableName} ${senderAddressHex} isn't available through the supplied web3 instance`, + ); }, async isUserAddressAvailableAsync(web3Wrapper: Web3Wrapper): Promise { const availableAddresses = await web3Wrapper.getAvailableAddressesAsync(); diff --git a/test/assert_test.ts b/test/assert_test.ts index 560ef06d4..6b623eaad 100644 --- a/test/assert_test.ts +++ b/test/assert_test.ts @@ -20,8 +20,9 @@ describe('Assertion library', () => { const validUnrelatedAddress = '0x8b0292b11a196601eddce54b665cafeca0347d42'; const varName = 'address'; return expect(assert.isSenderAddressAsync(varName, validUnrelatedAddress, (zeroEx as any).web3Wrapper)) - .to.be.rejectedWith(`Specified ${varName} ${validUnrelatedAddress} \ - isn't available through the supplied web3 instance`); + .to.be.rejectedWith( + `Specified ${varName} ${validUnrelatedAddress} isn't available through the supplied web3 instance`, + ); }); it('doesn\'t throw if address is available', async () => { const availableAddress = (await zeroEx.getAvailableAddressesAsync())[0]; -- cgit From db5d59b06eadd7e48431dab5fdce3dda8c2fad54 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 6 Jun 2017 15:53:18 +0200 Subject: Pass nonExistentSenderAddress so that we get the proper rejection --- test/exchange_wrapper_test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index e4b0d47f7..370e741b4 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -152,8 +152,9 @@ describe('ExchangeWrapper', () => { const signedOrder = await fillScenarios.createFillableSignedOrderAsync( makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, ); + const nonExistentSenderAddress = userAddresses[6]; return expect(zeroEx.exchange.fillOrderAsync( - signedOrder, fillTakerAmount, shouldCheckTransfer, takerAddress, + signedOrder, fillTakerAmount, shouldCheckTransfer, nonExistentSenderAddress, )).to.be.rejectedWith(ExchangeContractErrs.TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER); }); it('should throw when order is expired', async () => { -- cgit