use AssertionError instead assert.fail, add message confirmation to a…

…ssertFailure
OpenZeppelin · Jun 28, 2019 · 59aee75 · 59aee75
1 parent d431f14
commit 59aee75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/expectRevert.js b/src/expectRevert.js
@@ -2,15 +2,19 @@ const { web3 } = require('./setup');
 
 const colors = require('ansi-colors');
 const semver = require('semver');
-const assert = require('assert');
+const AssertionError = require('assert').AssertionError;
 
 async function expectException (promise, expectedError) {
   try {
     await promise;
   } catch (error) {
     if (error.message.indexOf(expectedError) === -1) {
       const actualError = error.message.replace('Returned error: VM Exception while processing transaction: ', '');
-      assert.fail(`Wrong failure type, expected '${expectedError}' and got '${actualError}'`);
+      throw new AssertionError({
+        message: 'Wrong failure type',
+        expected: expectedError,
+        actual: actualError
+      });
     }
     return;
   }

diff --git a/test/helpers/assertFailure.js b/test/helpers/assertFailure.js
@@ -1,9 +1,13 @@
 const { expect } = require('chai');
+const AssertionError = require('assert').AssertionError;
 
 async function assertFailure (promise) {
   try {
     await promise;
   } catch (error) {
+    if (error instanceof AssertionError) {
+      expect(error.message).to.equal('Wrong failure type');
+    }
     return;
   }
   expect.fail();