remove #pr and update e2e

Author: ci-bot

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

@@ -65,10 +65,12 @@ class switchEnvironment extends EventEmitter {
     ) => {
       const tryOne = (i: number) => {
         if (i >= labels.length) return onDone()
+        const submenuXPath = `//span[contains(@class,'dropdown-item') and normalize-space()='${labels[i]}']`
+
         browser
           .useXpath()
           .isPresent({
-            selector: `//span[contains(@class,'dropdown-item') and normalize-space()='${labels[i]}']`,
+            selector: submenuXPath,
             suppressNotFoundErrors: true,
             timeout: 0
           }, (present) => {
@@ -77,21 +79,30 @@ class switchEnvironment extends EventEmitter {
               return tryOne(i + 1)
             }
             browser
-              .moveToElement(`//span[contains(@class,'dropdown-item') and normalize-space()='${labels[i]}']`, 5, 5)
-              .pause(250)
+              .execute(function(xpath) {
+                  const element = document.evaluate(xpath, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue
+                  if (element) {
+                    const event = new MouseEvent('mouseover', { 'view': window, 'bubbles': true, 'cancelable': true })
+                    element.dispatchEvent(event)
+                  }
+                }, 
+                [submenuXPath]
+              )
               .useCss()
-              .isPresent({
-                selector: `body .dropdown-menu.show [data-id="dropdown-item-${providerName}"]`,
-                suppressNotFoundErrors: true,
-                timeout: 1000
-              }, (inPortal) => {
-                if (inPortal.value) {
+              .waitForElementVisible(
+              `body .dropdown-menu.show [data-id="dropdown-item-${providerName}"]`,
+              5000,
+              undefined,
+              false,
+              (result) => {
+                if (result.status === 0) {
                   clickAndMaybeWait(browser, `body .dropdown-menu.show [data-id="dropdown-item-${providerName}"]`, providerName, shouldWait)
                   onDone()
                 } else {
                   tryOne(i + 1)
                 }
-              })
+              }
+            )
           })
       }
       tryOne(0)

apps/remix-ide-e2e/src/tests/environment-account.test.ts

@@ -12,7 +12,7 @@ module.exports = {
     init(browser, done, null)
   },
 
-  'Should open submenu and close both menus on selection #group1 #pr': function (browser: NightwatchBrowser) {
+  'Should open submenu and close both menus on selection #group1': function (browser: NightwatchBrowser) {
    browser
       .clickLaunchIcon('udapp')
       .waitForElementVisible('[data-id="settingsSelectEnvOptions"]')
@@ -24,7 +24,7 @@ module.exports = {
       .assert.containsText('[data-id="selected-provider-vm-cancun"]', 'Remix VM (Cancun)')
   },
 
-  'Should display sample accounts and balances #group1 #pr': function (browser: NightwatchBrowser) {
+  'Should display sample accounts and balances #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('[data-id="runTabSelectAccount"]')
       .click('[data-id="runTabSelectAccount"]')

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

@@ -141,15 +141,22 @@ const tests = {
       .clickLaunchIcon('filePanel')
   },
   'Should show fork states provider in environment dropdown & make txs using forked state #group1': function (browser: NightwatchBrowser) {
+    const remixVMSpanXPath = "//span[contains(@class,'dropdown-item') and normalize-space()='Remix VM']"
     browser
       .clickLaunchIcon('udapp')
       .waitForElementVisible('[data-id="settingsSelectEnvOptions"]')
       .click('[data-id="settingsSelectEnvOptions"] button')
-      .useXpath()
-      .moveToElement("//span[contains(@class,'dropdown-item') and normalize-space()='Remix VM']", 5, 5)
-      .useCss()
+      .execute(function(xpath) {
+          const element = document.evaluate(xpath, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue
+          if (element) {
+            const event = new MouseEvent('mouseover', { 'view': window, 'bubbles': true, 'cancelable': true })
+            element.dispatchEvent(event)
+          }
+        },
+        [remixVMSpanXPath]
+      )
       .waitForElementVisible(`[data-id="dropdown-item-vm-fs-forkedState_1"]`)
-      .click('[data-id="settingsSelectEnvOptions"] button') 
+      .click('[data-id="settingsSelectEnvOptions"] button')
       .switchEnvironment('vm-prague')
       .openFile('contracts/1_Storage.sol')
       .clickLaunchIcon('solidity')
@@ -170,12 +177,18 @@ const tests = {
       .assert.elementPresent('*[data-id="selected-provider-vm-fs-forkedState_2"]')
 
       .click('[data-id="settingsSelectEnvOptions"] button')
-      .useXpath()
-      .moveToElement("//span[contains(@class,'dropdown-item') and normalize-space()='Remix VM']", 5, 5)
-      .useCss()
+      .execute(function(xpath) {
+          const element = document.evaluate(xpath, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue
+          if (element) {
+            const event = new MouseEvent('mouseover', { 'view': window, 'bubbles': true, 'cancelable': true })
+            element.dispatchEvent(event)
+          }
+        },
+        [remixVMSpanXPath]
+      )
+
       .waitForElementVisible(`[data-id="dropdown-item-vm-fs-forkedState_2"]`)
       .click('[data-id="settingsSelectEnvOptions"] button')
-      
       .click('*[data-id="Deploy - transact (not payable)"]')
       .clickInstance(0)
       .clickFunction('store - transact (not payable)', { types: 'uint256 num', values: '"555"' })