Merge branch 'master' into test-local-plugin

apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts

@@ -207,6 +207,23 @@ module.exports = {
       .removeFile('tests/hhLogs_test.sol', 'workspace_new')
   },
 
+  'Solidity Unit tests with hardhat console log for EVM revert': function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
+      .addFile('tests/ballotFailedLog_test.sol', sources[0]['tests/ballotFailedLog_test.sol'])
+      .clickLaunchIcon('solidityUnitTesting')
+      .waitForElementVisible('*[id="singleTesttests/4_Ballot_test.sol"]', 60000)
+      .click('*[id="singleTesttests/4_Ballot_test.sol"]')
+      .click('#runTestsTabRunAction')
+      .pause(2000)
+      .waitForElementVisible('*[data-id="testTabSolidityUnitTestsOutputheader"]', 120000)
+      .waitForElementContainsText('#solidityUnittestsOutput', 'tests/ballotFailedLog_test.sol', 60000)
+      .assert.containsText('#journal > div:nth-child(6) > span > div', 'Check winning proposal:')
+      .assert.containsText('#journal > div:nth-child(6) > span > div', 'Inside checkWinningProposal')
+      .openFile('tests/ballotFailedLog_test.sol')
+      .removeFile('tests/ballotFailedLog_test.sol', 'workspace_new')
+  },
+
   'Debug failed test using debugger': function (browser: NightwatchBrowser) {
     browser
       .waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
@@ -483,6 +500,31 @@ const sources = [
           }
       }`
     },
+    'tests/ballotFailedLog_test.sol': {
+      content: `// SPDX-License-Identifier: GPL-3.0
+
+      pragma solidity >=0.7.0 <0.9.0;
+      import "remix_tests.sol"; // this import is automatically injected by Remix.
+      import "../contracts/3_Ballot.sol";
+
+      import "hardhat/console.sol";
+      
+      contract BallotTest {
+         
+          bytes32[] proposalNames;
+         
+          Ballot ballotToTest;
+          function beforeAll () public {
+              proposalNames.push(bytes32("candidate1"));
+              ballotToTest = new Ballot(proposalNames);
+          }
+          
+          function checkWinningProposal () public {
+              console.log("Inside checkWinningProposal");
+              ballotToTest.vote(1); // This will revert the transaction
+          }
+      }`
+    },
     'tests/hhLogs_test.sol': {
       content: `// SPDX-License-Identifier: GPL-3.0
 

libs/remix-tests/src/testRunner.ts

@@ -232,6 +232,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
   testCallback(undefined, resp)
   async.eachOfLimit(runList, 1, function (func, index, next) {
     let sender: string | null = null
+    let hhLogs
     if (func.signature) {
       sender = getOverridedSender(contractDetails.userdoc, func.signature, contractDetails.evm.methodIdentifiers)
       if (opts.accounts && sender) {
@@ -293,7 +294,6 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
       sendParams.gas = 10000000 * 8
       method.send(sendParams).on('receipt', async (receipt) => {
         try {
-          let hhLogs
           if (web3.eth && web3.eth.getHHLogsForTx) hhLogs = await web3.eth.getHHLogsForTx(receipt.transactionHash)
           const time: number = (Date.now() - startTime) / 1000.0
           const assertionEventHashes = assertionEvents.map(e => Web3.utils.sha3(e.name + '(' + e.params.join() + ')'))
@@ -366,7 +366,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
           console.error(err)
           return next(err)
         }
-      }).on('error', function (err: Error) {
+      }).on('error', async (err: Error) => {
         const time: number = (Date.now() - startTime) / 1000.0
         const resp: TestResultInterface = {
           type: 'testFailure',
@@ -377,6 +377,11 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
           context: testName,
           web3
         }
+        if (err.message.includes('Transaction has been reverted by the EVM')) {
+          const txHash = JSON.parse(err.message.replace('Transaction has been reverted by the EVM:', '')).transactionHash
+          if (web3.eth && web3.eth.getHHLogsForTx) hhLogs = await web3.eth.getHHLogsForTx(txHash)
+          if (hhLogs) resp.hhLogs = hhLogs
+        }
         testCallback(undefined, resp)
         failureNum += 1
         timePassed += time