fix SUT e2e

Author: Aniket-Engg

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

@@ -131,7 +131,7 @@ module.exports = {
       .click('*[data-id="testTabCheckAllTests"]')
       .clickElementAtPosition('.singleTestLabel', 1)
       .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
-      .waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'contract deployment failed: revert', 120000)
+      .waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'contract deployment failed', 120000)
   },
 
   'Should fail when parameters are passed to method in test contract #group3': function (browser: NightwatchBrowser) {

libs/remix-tests/src/deployer.ts

@@ -77,9 +77,13 @@ export function deployAll (compileResult: compilationInterface, provider: Browse
               if (deployCb) await deployCb(filename, receipt.contractAddress)
               callback(null, { receipt: { contractAddress: receipt.contractAddress } }) // TODO this will only work with JavaScriptV VM
             })
+          }).catch((err) => {
+            const error = new Error(err)
+            console.error('Error while estimating gas: ', error.message)
+            callback(error.message)
           })
         }).catch((err) => {
-          console.error(err)
+          console.error('Error while getting deployment transaction: ', err)
           callback(err)
         })
       }

libs/remix-tests/src/runTestSources.ts

@@ -61,12 +61,12 @@ export class UnitTestRunner {
             // If contract deployment fails because of 'Out of Gas' error, try again with double gas
             // This is temporary, should be removed when remix-tests will have a dedicated UI to
             // accept deployment params from UI
-            if (err.error.includes('The contract code couldn\'t be stored, please check your gas limit')) {
+            if (err.includes('missing revert data')) {
               deployAll(compilationResult, this.provider, this.testsAccounts, true, deployCb, (error, contracts) => {
-                if (error) next([{ message: 'contract deployment failed after trying twice: ' + (error.innerError || error.error), severity: 'error' }]) // IDE expects errors in array
+                if (error) next([{ message: 'contract deployment failed after trying twice: ' + (error || error.error), severity: 'error' }]) // IDE expects errors in array
                 else next(null, compilationResult, contracts)
               })
-            } else { next([{ message: 'contract deployment failed: ' + (err.innerError || err.error), severity: 'error' }]) } // IDE expects errors in array
+            } else { next([{ message: 'contract deployment failed: ' + (err || err.error), severity: 'error' }]) } // IDE expects errors in array
           } else { next(null, compilationResult, contracts) }
         })
       },
@@ -134,7 +134,6 @@ export class UnitTestRunner {
           errors.forEach((error, _index) => {
             finalResults.errors.push({ context: error.context, value: error.value, message: error.errMsg })
           })
-
           next(null, finalResults)
         })
       }

libs/remix-tests/src/testRunner.ts

@@ -225,11 +225,11 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
     value: opts.accounts
   }
   testCallback(undefined, accts)
-
+  const filename = testObject.filename
   const resp: TestResultInterface = {
     type: 'contract',
     value: testName,
-    filename: testObject.filename
+    filename
   }
   testCallback(undefined, resp)
   async.eachOfLimit(runList, 1, async function (func, index, next) {
@@ -253,7 +253,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
         const resp: TestResultInterface = {
           type: 'testPass',
           value: changeCase.sentenceCase(func.name),
-          filename: testObject.filename,
+          filename,
           time: time,
           context: testName,
           provider,
@@ -267,7 +267,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
         const resp: TestResultInterface = {
           type: 'testFailure',
           value: changeCase.sentenceCase(func.name),
-          filename: testObject.filename,
+          filename,
           time: time,
           errMsg: 'function returned false',
           context: testName,
@@ -279,6 +279,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
         failureNum += 1
         timePassed += time
       }
+      return next()
     } else {
       if (func.signature) {
         sender = getOverriddenSender(contractDetails.userdoc, func.signature, contractDetails.evm.methodIdentifiers)
@@ -308,6 +309,23 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
         const time: number = (Date.now() - startTime) / 1000.0
         const assertionEventHashes = assertionEvents.map(e => keccak256(toUtf8Bytes(e.name + '(' + e.params.join() + ')')))
         let testPassed = false
+        if (receipt.status === 0) {
+          const resp: TestResultInterface = {
+            type: 'testFailure',
+            value: changeCase.sentenceCase(func.name),
+            filename,
+            time: time,
+            errMsg: `Transaction with hash "${debugTxHash}" has been reverted by the EVM.`,
+            context: testName,
+            provider, 
+            debugTxHash
+          }
+        if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
+                testCallback(undefined, resp)
+                failureNum += 1
+                timePassed += time
+                return next()
+        }
         for (const i in receipt.logs) {
           let events = receipt.logs[i]
           if (!Array.isArray(events)) events = [events]
@@ -323,10 +341,11 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
                   testEvent[4] = 'true'
                 }
                 const location = getAssertMethodLocation(fileAST, testName, func.name, assertMethod)
+
                 const resp: TestResultInterface = {
                   type: 'testFailure',
                   value: changeCase.sentenceCase(func.name),
-                  filename: testObject.filename,
+                  filename,
                   time: time,
                   errMsg: testEvent[1],
                   context: testName,
@@ -352,7 +371,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
           const resp: TestResultInterface = {
             type: 'testPass',
             value: changeCase.sentenceCase(func.name),
-            filename: testObject.filename,
+            filename,
             time: time,
             context: testName,
             provider,
@@ -366,7 +385,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
           const resp: TestResultInterface = {
             type: 'logOnly',
             value: changeCase.sentenceCase(func.name),
-            filename: testObject.filename,
+            filename,
             time: time,
             context: testName,
             hhLogs
@@ -390,7 +409,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
         const resp: TestResultInterface = {
           type: 'testFailure',
           value: changeCase.sentenceCase(func.name),
-          filename: testObject.filename,
+          filename,
           time: time,
           errMsg,
           context: testName,