Merge branch 'master' into statusbar-updates

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

@@ -0,0 +1,34 @@
+import { NightwatchBrowser } from 'nightwatch'
+import EventEmitter from 'events'
+
+class HideMetaMaskPopup extends EventEmitter {
+  command(this: NightwatchBrowser) {
+    browser
+      .pause(5000)
+      .isVisible({
+        selector: 'button[data-testid="popover-close"]',
+        locateStrategy: 'css selector',
+        suppressNotFoundErrors: true,
+        timeout: 2000
+      }, (okVisible) => {
+        console.log('okVisible', okVisible)
+        if (!okVisible.value) {
+          console.log('popover not found')
+        } else {
+          console.log('popover found... closing')
+          browser.click('button[data-testid="popover-close"]')
+        }
+      })
+      .waitForElementNotPresent({
+        selector: 'button[data-testid="popover-close"]',
+        locateStrategy: 'css selector',
+        timeout: 2000
+      })
+      .perform((done) => {
+        done()
+        this.emit('complete')
+      })
+  }
+}
+
+module.exports = HideMetaMaskPopup

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

@@ -16,6 +16,7 @@ class MetaMask extends EventEmitter {
 
 function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password: string, done: VoidFunction) {
   const words = passphrase.split(' ')
+  console.log('setup metamask')
   browser
     .switchBrowserTab(1)
     .waitForElementVisible('input[data-testid="onboarding-terms-checkbox"]')
@@ -49,6 +50,7 @@ function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password:
     .click('button[data-testid="pin-extension-next"]')
     .waitForElementVisible('button[data-testid="pin-extension-done"]')
     .click('button[data-testid="pin-extension-done"]')
+    .pause(5000)
     .isVisible({
       selector: 'button[data-testid="popover-close"]',
       locateStrategy: 'css selector',
@@ -58,14 +60,22 @@ function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password:
       console.log('okVisible', okVisible)
       if (!okVisible.value) {
         console.log('popover not found')
-      }else{
+      } else {
+        console.log('popover found... closing')
         browser.click('button[data-testid="popover-close"]')
       }
     })
+    .waitForElementNotPresent({
+      selector: 'button[data-testid="popover-close"]',
+      locateStrategy: 'css selector',
+      timeout: 3000
+    })
+    .saveScreenshot('./reports/screenshots/metamask.png')
     .click('[data-testid="network-display"]')
     .click('.mm-modal-content label.toggle-button--off') // show test networks
     .click('div[data-testid="Sepolia"]') // switch to sepolia
     .perform(() => {
+      console.log('MetaMask setup complete')
       done()
     })
 }

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

@@ -11,7 +11,7 @@ const checkBrowserIsChrome = function (browser: NightwatchBrowser) {
   return browser.browserName.indexOf('chrome') > -1
 }
 
-const checkAlerts = function (browser: NightwatchBrowser){
+const checkAlerts = function (browser: NightwatchBrowser) {
   browser.isVisible({
     selector: '//*[contains(.,"not have enough")]',
     locateStrategy: 'xpath',
@@ -50,6 +50,7 @@ const tests = {
       .pause(5000)
       .switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
         browser
+          .hideMetaMaskPopup()
           .waitForElementVisible('*[data-testid="page-container-footer-next"]', 60000)
           .click('*[data-testid="page-container-footer-next"]') // this connects the metamask account to remix
           .pause(2000)
@@ -83,6 +84,7 @@ const tests = {
         browser.switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
           checkAlerts(browser)
           browser
+            .hideMetaMaskPopup()
             .waitForElementPresent('[data-testid="page-container-footer-next"]')
             .click('[data-testid="page-container-footer-next"]') // approve the tx
             .switchBrowserTab(0) // back to remix
@@ -102,6 +104,7 @@ const tests = {
       .perform((done) => {
         browser.switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
           browser
+            .hideMetaMaskPopup()
             .waitForElementPresent('[data-testid="page-container-footer-next"]')
             .click('[data-testid="page-container-footer-next"]') // approve the tx
             .switchBrowserTab(0) // back to remix
@@ -162,6 +165,8 @@ const tests = {
       .perform((done) => {
         browser.switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
           browser
+            .hideMetaMaskPopup()
+            .saveScreenshot('./reports/screenshots/metamask_4.png')
             .waitForElementPresent('[data-testid="page-container-footer-next"]', 60000)
             .click('[data-testid="page-container-footer-next"]') // approve the tx
             .switchBrowserTab(0) // back to remix
@@ -177,6 +182,8 @@ const tests = {
       .perform((done) => { // call delegate
         browser.switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
           browser
+            .hideMetaMaskPopup()
+            .saveScreenshot('./reports/screenshots/metamask_5.png')
             .waitForElementPresent('[data-testid="page-container-footer-next"]', 60000)
             .click('[data-testid="page-container-footer-next"]') // approve the tx
             .switchBrowserTab(0) // back to remix
@@ -216,7 +223,9 @@ const tests = {
           .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
           .clickLaunchIcon('debugger')
           .setValue('*[data-id="debuggerTransactionInput"]', txhash) // debug tx
+          .saveScreenshot('./reports/screenshots/metamask_2.png')
           .click('*[data-id="debuggerTransactionStartButton"]')
+          .saveScreenshot('./reports/screenshots/metamask_3.png')
           .waitForElementVisible('*[data-id="treeViewDivto"]', 30000)
           .checkVariableDebug('soliditylocals', localsCheck)
           .perform(() => done())
@@ -236,7 +245,7 @@ const branch = process.env.CIRCLE_BRANCH;
 const isMasterBranch = branch === 'master';
 
 module.exports = {
-  ...(branch ? (isMasterBranch ? tests : {}) : tests),
+  ...{} //(branch ? (isMasterBranch ? tests : {}) : tests),
 };
 
 const localsCheck = {

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

@@ -48,6 +48,7 @@ declare module 'nightwatch' {
     removeFile(path: string, workspace: string): NightwatchBrowser
     switchBrowserWindow(url: string, windowName: string, cb: (browser: NightwatchBrowser, window?: NightwatchCallbackResult<Window>) => void): NightwatchBrowser
     setupMetamask(passphrase: string, password: string): NightwatchBrowser
+    hideMetaMaskPopup(): NightwatchBrowser
     signMessage(msg: string, callback: (hash: {value: string}, signature: {value: string}) => void): NightwatchBrowser
     setSolidityCompilerVersion(version: string): NightwatchBrowser
     clickElementAtPosition(cssSelector: string, index: number, opt?: {forceSelectIfUnselected: boolean}): NightwatchBrowser