replace function

apps/remix-ide-e2e/src/commands/journalLastChildIncludes.ts

@@ -5,14 +5,14 @@ import EventEmitter from 'events'
   Check if the last log in the console contains a specific text
 */
 class JournalLastChildIncludes extends EventEmitter {
-  command (this: NightwatchBrowser, val: string): NightwatchBrowser {
+  command(this: NightwatchBrowser, val: string): NightwatchBrowser {
      this.api
-      .waitForElementVisible('*[data-id="terminalJournal"]', 10000)
-      .pause(1000)
-      .getText('*[data-id="terminalJournal"]', (result) => {
-        console.log('JournalLastChildIncludes', result.value)
-        if (typeof result.value === 'string' && result.value.indexOf(val) === -1) return this.api.assert.fail(`wait for ${val} in ${result.value}`)
-        else this.api.assert.ok(true, `<*[data-id="terminalJournal"]> contains ${val}.`)
+      .waitForElementPresent({
+        selector: `//*[@data-id='terminalJournal' and contains(.,'${val}')]`,
+        timeout: 10000,
+        locateStrategy: 'xpath'
+      }).perform((done) => {
+        done()
         this.emit('complete')
       })
     return this

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

@@ -224,7 +224,6 @@ module.exports = {
   'Call web3.eth.getAccounts() using Injected Provider (Metamask)': !function (browser: NightwatchBrowser) {
     browser
       .executeScriptInTerminal('web3.eth.getAccounts()')
-      .pause(2000)
       .journalLastChildIncludes('[ "0x76a3ABb5a12dcd603B52Ed22195dED17ee82708f" ]')
       .end()
   }

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

@@ -29,7 +29,6 @@ module.exports = {
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
           browser.sendLowLevelTx(address, '0', '0xaa')
-            .pause(1000)
             .journalLastChildIncludes('to: CheckSpecials.(fallback)')
             .journalLastChildIncludes('value: 0 wei')
             .journalLastChildIncludes('data: 0xaa')
@@ -67,7 +66,6 @@ module.exports = {
     browser.perform((done) => {
       browser.getAddressAtPosition(0, (address) => {
         browser.sendLowLevelTx(address, '1', '')
-          .pause(1000)
           .journalLastChildIncludes('to: CheckSpecials.(receive)')
           .journalLastChildIncludes('value: 1 wei')
           .journalLastChildIncludes('data: 0x')
@@ -80,7 +78,6 @@ module.exports = {
     browser.perform((done) => {
       browser.getAddressAtPosition(0, (address) => {
         browser.sendLowLevelTx(address, '10', '0xaa')
-          .pause(1000)
           .journalLastChildIncludes('to CheckSpecials.(fallback) errored:')
           .journalLastChildIncludes('The called function should be payable if you send value')
           .perform(done())
@@ -97,7 +94,6 @@ module.exports = {
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
           browser.sendLowLevelTx(address, '1', '')
-            .pause(1000)
             .journalLastChildIncludes('to: CheckSpecials.(receive)')
             .journalLastChildIncludes('value: 1 wei')
             .journalLastChildIncludes('data: 0x')
@@ -110,7 +106,6 @@ module.exports = {
     browser.perform((done) => {
       browser.getAddressAtPosition(0, (address) => {
         browser.sendLowLevelTx(address, '0', '0xaa')
-          .pause(1000)
           .waitForElementVisible(`#instance${address} label[id="deployAndRunLLTxError"]`)
           .assert.containsText(`#instance${address} label[id="deployAndRunLLTxError"]`, '\'Fallback\' function is not defined')
           .perform(done())
@@ -127,7 +122,6 @@ module.exports = {
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
           browser.sendLowLevelTx(address, '1', '')
-            .pause(1000)
             .journalLastChildIncludes('to: CheckSpecials.(fallback)')
             .journalLastChildIncludes('value: 1 wei')
             .journalLastChildIncludes('data: 0x')
@@ -140,7 +134,6 @@ module.exports = {
     browser.perform((done) => {
       browser.getAddressAtPosition(0, (address) => {
         browser.sendLowLevelTx(address, '1', '0xaa')
-          .pause(1000)
           .journalLastChildIncludes('to: CheckSpecials.(fallback)')
           .journalLastChildIncludes('value: 1 wei')
           .journalLastChildIncludes('data: 0xaa')
@@ -180,7 +173,6 @@ module.exports = {
       .perform((done) => {
         browser.getAddressAtPosition(0, (address) => {
           browser.sendLowLevelTx(address, '999999998765257135', '0xaa')
-            .pause(1000)
             .journalLastChildIncludes('to: CheckSpecials.(fallback)')
             .journalLastChildIncludes('value: 999999998765257135 wei')
             .journalLastChildIncludes('data: 0xaa')

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

@@ -202,7 +202,6 @@ module.exports = {
       .addFile('scripts/deploy_storage.js', { content: scriptAutoExec.script })
       .openFile('contracts/storage.sol')
       .sendKeys('body', [browser.Keys.CONTROL, browser.Keys.SHIFT, 's'])
-      .pause(15000)
       .journalLastChildIncludes('147')
   },
 

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

@@ -141,7 +141,6 @@ module.exports = {
       .click('.udapp_contractActionsContainerSingle > button')
       .clickInstance(0)
       .clickFunction('g - transact (not payable)')
-      .pause(5000)
       .journalLastChildIncludes('Error provided by the contract:')
       .journalLastChildIncludes('CustomError : error description')
       .journalLastChildIncludes('Parameters:')
@@ -182,7 +181,6 @@ module.exports = {
       .click('.udapp_contractActionsContainerSingle > button')
       .clickInstance(1)
       .clickFunction('h - transact (not payable)')
-      .pause(5000)
       .journalLastChildIncludes('Error provided by the contract:')
       .journalLastChildIncludes('CustomError : error description from library')
       .journalLastChildIncludes('Parameters:')