fix test

Author: ci-bot

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

@@ -4,22 +4,46 @@ import EventEmitter from 'events'
 class WaitForElementContainsText extends EventEmitter {
   command (this: NightwatchBrowser, id: string, value: string, timeout = 10000): NightwatchBrowser {
     let waitId // eslint-disable-line
-    let currentValue
-    const runid = setInterval(() => {
-      this.api.getText(id, (result) => {
-        currentValue = result.value
-        if (typeof result.value === 'string' && result.value.indexOf(value) !== -1) {
-          clearInterval(runid)
-          clearTimeout(waitId)
-          this.api.assert.ok(true, `WaitForElementContainsText ${id} contains ${value}`)
-          this.emit('complete')
+    let currentValues: string[] = []
+    const runid = setInterval(async () => {
+      const elements = await this.api.findElements('css selector', id)
+
+      if (elements.length === 0) {
+        currentValues = []
+        return
+      }
+
+      // Check all elements that match the selector
+      let foundMatch = false
+      const textValues: string[] = []
+
+      for (const element of elements) {
+        let text
+        this.api.getText(element.getId(), (result) => {
+          text = typeof result === 'string' ? result : result.value
+          currentValues.push(text)
+        })
+        
+        if (typeof text === 'string' && text.indexOf(value) !== -1) {
+          foundMatch = true
+          break
         }
-      })
+      }
+
+      currentValues = textValues
+
+      if (foundMatch) {
+        clearInterval(runid)
+        clearTimeout(waitId)
+        this.api.assert.ok(true, `WaitForElementContainsText ${id} contains ${value}`)
+        this.emit('complete')
+      }
     }, 200)
 
     waitId = setTimeout(() => {
       clearInterval(runid)
-      this.api.assert.fail(`TimeoutError: An error occurred while running .waitForElementContainsText() command on ${id} after ${timeout} milliseconds. expected: ${value} - got: ${currentValue}`)
+      const valuesFound = currentValues.length > 0 ? currentValues.join(', ') : 'none'
+      this.api.assert.fail(`TimeoutError: An error occurred while running .waitForElementContainsText() command on ${id} after ${timeout} milliseconds. expected: ${value} - got: ${valuesFound}`)
     }, timeout)
     return this
   }

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

@@ -384,14 +384,14 @@ module.exports = {
       .openFile('contracts/governance/UnionGovernor.sol')
   },
 
-  'Should execute function call from URL parameters #group3': function (browser: NightwatchBrowser) {
+  'Should execute function call from URL parameters #group3 #pr': function (browser: NightwatchBrowser) {
     browser
       .switchWorkspace('default_workspace')
       .url('http://127.0.0.1:8080?calls=fileManager//open//contracts/3_Ballot.sol///terminal//log//log')
       .refreshPage()
       .waitForElementVisible('*[data-shared="tooltipPopup"]')
       .waitForElementContainsText('*[data-shared="tooltipPopup"]', 'initiating fileManager and calling "open" ...')
-      .waitForElementContainsText('*[data-shared="tooltipPopup"]', 'initiating terminal and calling "log" ...')
+      .waitForElementContainsText('*[data-shared="tooltipPopup"]:nth-of-type(2)', 'initiating terminal and calling "log" ...', 10000, 1)
   },
 
   'Import Github folder from URL params #group4': function (browser: NightwatchBrowser) {

apps/remix-ide-e2e/src/types/index.d.ts

@@ -35,7 +35,7 @@ declare module 'nightwatch' {
     renamePath(path: string, newFileName: string, renamedPath: string): NightwatchBrowser
     rightClickCustom(cssSelector: string): NightwatchBrowser
     scrollToLine(line: number): NightwatchBrowser
-    waitForElementContainsText(id: string, value: string, timeout?: number): NightwatchBrowser
+    waitForElementContainsText(id: string, value: string, timeout?: number, index?: number): NightwatchBrowser
     getModalBody(callback: (value: string, cb: VoidFunction) => void): NightwatchBrowser
     modalFooterCancelClick(id?: string): NightwatchBrowser
     selectContract(contractName: string): NightwatchBrowser