Await in tests to prevent clash in before blocks

0xProject · Mar 21, 2019 · bec440c · bec440c
1 parent 8453c5e
commit bec440c
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/packages/contract-wrappers/test/exchange_wrapper_test.ts b/packages/contract-wrappers/test/exchange_wrapper_test.ts
@@ -22,7 +22,7 @@ chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 
-describe('ExchangeWrapper', () => {
+describe.only('ExchangeWrapper', () => {
     let contractWrappers: ContractWrappers;
     let userAddresses: string[];
     let zrxTokenAddress: string;
@@ -329,16 +329,26 @@ describe('ExchangeWrapper', () => {
                 new BigNumber(2).pow(20).minus(1),
             );
             const untransferrableMakerAssetData = assetDataUtils.encodeERC20AssetData(untransferrableToken.address);
-            signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+            const invalidSignedOrder = await fillScenarios.createFillableSignedOrderAsync(
                 untransferrableMakerAssetData,
                 takerAssetData,
                 makerAddress,
                 takerAddress,
                 fillableAmount,
             );
-            expect(
-                contractWrappers.exchange.validateOrderFillableOrThrowAsync(signedOrder),
-            ).to.eventually.to.be.rejectedWith(RevertReason.TransferFailed);
+            await web3Wrapper.awaitTransactionSuccessAsync(
+                await contractWrappers.erc20Token.setProxyAllowanceAsync(
+                    untransferrableToken.address,
+                    makerAddress,
+                    signedOrder.makerAssetAmount,
+                ),
+            );
+            try {
+                await contractWrappers.exchange.validateOrderFillableOrThrowAsync(invalidSignedOrder);
+                expect(true).to.be.false(); // never hit
+            } catch (e) {
+                expect(e.message).to.include('TRANSFER_FAILED');
+            }
         });
     });
     describe('#isValidSignature', () => {