Fix revertedWith functionality (TrueFiEng#442)

bnymnDev · Feb 26, 2021 · 9223982 · 9223982
1 parent 246281f
commit 9223982
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/waffle-chai/src/matchers/revertedWith.ts b/waffle-chai/src/matchers/revertedWith.ts
@@ -24,8 +24,11 @@ export function supportRevertedWith(Assertion: Chai.AssertionStatic) {
         error = error.error;
       }
 
+      const reasonsList = error.results && Object.values(error.results).map((o: any) => o.reason);
       const message = (error instanceof Object && 'message' in error) ? error.message : JSON.stringify(error);
-      const isReverted = message.search('revert') >= 0 && message.search(revertReason) >= 0;
+      const isReverted = reasonsList
+        ? reasonsList.some((r: string) => r === revertReason)
+        : message.search('revert') >= 0 && message.search(revertReason) >= 0;
       const isThrown = message.search('invalid opcode') >= 0 && revertReason === '';
 
       this.assert(

diff --git a/waffle-chai/test/matchers/reverted.test.ts b/waffle-chai/test/matchers/reverted.test.ts
@@ -82,6 +82,18 @@ describe('INTEGRATION: Matchers: revertedWith', () => {
     await expect(matchers.doRevertAndModify()).to.be.revertedWith('Revert cause');
   });
 
+  it('Revert with modification: fail when not full message match', async () => {
+    await expect(
+      expect(matchers.doRevertAndModify()).to.be.revertedWith('cause')
+    ).to.eventually.be.rejected;
+  });
+
+  it('Revert with modification: fail when empty string', async () => {
+    await expect(
+      expect(matchers.doRevertAndModify()).to.be.revertedWith('')
+    ).to.eventually.be.rejected;
+  });
+
   it('Revert with modification: fail when different message was thrown', async () => {
     await expect(
       expect(matchers.doRevertAndModify()).to.be.revertedWith('Different message')