Merge pull request #1852 from 0xProject/fix/contracts/expectTransacti…

…onFailedAsyncFalsePositives Fixes false positives in `expectTransactionFailedAsync`
0xProject · Jun 5, 2019 · 8453c61 · 8453c61
2 parents b2cf701 + 56bc294
commit 8453c61
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "3.1.8",
+        "changes": [
+            {
+                "note": "Fixed false positives in `expectTransactionFailedAsync` and `expectContractCallFailedAsync`",
+                "pr": 1852
+            }
+        ]
+    },
     {
         "timestamp": 1558712885,
         "version": "3.1.7",

diff --git a/contracts/test-utils/src/assertions.ts b/contracts/test-utils/src/assertions.ts
@@ -104,7 +104,8 @@ export async function expectTransactionFailedAsync(p: sendTransactionResult, rea
     }
     switch (nodeType) {
         case NodeType.Ganache:
-            return expect(p).to.be.rejectedWith(reason);
+            const rejectionMessageRegex = new RegExp(`^VM Exception while processing transaction: revert ${reason}$`);
+            return expect(p).to.be.rejectedWith(rejectionMessageRegex);
         case NodeType.Geth:
             logUtils.warn(
                 'WARNING: Geth does not support revert reasons for sendTransaction. This test will pass if the transaction fails for any reason.',
@@ -160,7 +161,8 @@ export async function expectTransactionFailedWithoutReasonAsync(p: sendTransacti
  * otherwise resolve with no value.
  */
 export async function expectContractCallFailedAsync<T>(p: Promise<T>, reason: RevertReason): Promise<void> {
-    return expect(p).to.be.rejectedWith(reason);
+    const rejectionMessageRegex = new RegExp(`^VM Exception while processing transaction: revert ${reason}$`);
+    return expect(p).to.be.rejectedWith(rejectionMessageRegex);
 }
 
 /**