Merge branch 'master' into atad

.circleci/config.yml

@@ -8,7 +8,7 @@ parameters:
     type: boolean
     default: false
 orbs:
-  browser-tools: circleci/browser-tools@1.2.3
+  browser-tools: circleci/browser-tools@1.3.0
 jobs:
   build:
     docker:

apps/remix-ide-e2e/nightwatch.ts

@@ -29,7 +29,13 @@ module.exports = {
         javascriptEnabled: true,
         acceptSslCerts: true,
         'goog:chromeOptions': {
-          args: ['window-size=2560,1440', 'start-fullscreen', '--no-sandbox', '--headless', '--verbose']
+          args: ['window-size=2560,1440', 
+          'start-fullscreen', 
+          '--no-sandbox', 
+          '--headless', 
+          '--verbose',
+          "--user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36",
+          ]
         }
       }
     },

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

@@ -1,7 +1,7 @@
 import { NightwatchBrowser } from 'nightwatch'
 import EventEmitter from 'events'
 
-class ExecuteScript extends EventEmitter {
+class ExecuteScriptInTerminal extends EventEmitter {
   command (this: NightwatchBrowser, script: string): NightwatchBrowser {
     this.api
       .clearEditableContent('*[data-id="terminalCliInput"]')
@@ -17,4 +17,4 @@ class ExecuteScript extends EventEmitter {
   }
 }
 
-module.exports = ExecuteScript
+module.exports = ExecuteScriptInTerminal

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

@@ -9,11 +9,10 @@ class GetEditorValue extends EventEmitter {
 
         return elem.currentContent()
       }, [], (result) => {
-        done()
         const value = typeof result.value === 'string' ? result.value : null
-
         callback(value)
         this.emit('complete')
+        done()
       })
     })
     return this

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

@@ -1,4 +1,4 @@
-import { NightwatchBrowser } from 'nightwatch'
+import { ELEMENT_KEY, NightwatchBrowser } from 'nightwatch'
 import EventEmitter from 'events'
 
 /*
@@ -11,7 +11,7 @@ class JournalChildIncludes extends EventEmitter {
     let occurence = 0
     this.api.elements('css selector', '*[data-id="terminalJournal"]', (res) => {
       Array.isArray(res.value) && res.value.forEach(function (jsonWebElement) {
-        const jsonWebElementId = jsonWebElement.ELEMENT || jsonWebElement[Object.keys(jsonWebElement)[0]]
+        const jsonWebElementId = jsonWebElement[ELEMENT_KEY] || jsonWebElement[Object.keys(jsonWebElement)[0]]
 
         browser.elementIdText(jsonWebElementId, (jsonElement) => {
           const text = jsonElement.value

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

@@ -22,9 +22,16 @@ function openFile (browser: NightwatchBrowser, name: string, done: VoidFunction)
         browser.element('css selector', '[data-id="verticalIconsKindfilePanel"] img[data-id="selected"]', (result) => {
           if (result.status === 0) {
               done()
-          } else browser.clickLaunchIcon('filePanel').perform(done)
+          } else browser.clickLaunchIcon('filePanel').perform(() => {
+            done()
+          })
         })
-      } else browser.clickLaunchIcon('filePanel').perform(done)
+      } else {
+        browser.clickLaunchIcon('filePanel').perform(() => {
+          done()
+        })
+      }
+      
     })    
   })
   .waitForElementVisible('li[data-id="treeViewLitreeViewItem' + name + '"', 60000)

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

@@ -1,10 +1,10 @@
 import EventEmitter from 'events'
 import { NightwatchBrowser } from 'nightwatch'
 
-class RightClick extends EventEmitter {
+class RightClickCustom extends EventEmitter {
   command (this: NightwatchBrowser, cssSelector: string) {
     this.api.perform((done) => {
-      rightClick(this.api, cssSelector, () => {
+      rightClickCustom(this.api, cssSelector, () => {
         done()
         this.emit('complete')
       })
@@ -13,7 +13,7 @@ class RightClick extends EventEmitter {
   }
 }
 
-function rightClick (browser: NightwatchBrowser, cssSelector: string, callback: VoidFunction) {
+function rightClickCustom (browser: NightwatchBrowser, cssSelector: string, callback: VoidFunction) {
   browser.execute(function (cssSelector: string) {
     const element: any = document.querySelector(cssSelector)
     const evt = element.ownerDocument.createEvent('MouseEvents')
@@ -34,4 +34,4 @@ function rightClick (browser: NightwatchBrowser, cssSelector: string, callback:
   })
 }
 
-module.exports = RightClick
+module.exports = RightClickCustom

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

@@ -6,7 +6,9 @@ class switchWorkspace extends EventEmitter {
     this.api.waitForElementVisible('[data-id="workspacesSelect"]')
     .click('[data-id="workspacesSelect"]')
     .waitForElementVisible(`[data-id="dropdown-item-${workspaceName}"]`)
+    .pause(2000)
     .click(`[data-id="dropdown-item-${workspaceName}"]`)
+    .pause(3000)
     .perform((done) => {
       done()
       this.emit('complete')
@@ -15,4 +17,4 @@ class switchWorkspace extends EventEmitter {
   }
 }
 
-module.exports = switchWorkspace
+module.exports = switchWorkspace

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

@@ -1,4 +1,4 @@
-import { NightwatchBrowser, NightwatchTestFunctionExpectedInput } from 'nightwatch'
+import { ELEMENT_KEY, NightwatchBrowser, NightwatchTestFunctionExpectedInput } from 'nightwatch'
 import EventEmitter from 'events'
 
 const deepequal = require('deep-equal')
@@ -22,14 +22,17 @@ class TestFunction extends EventEmitter {
         })
       })
       .perform((done) => {
-        browser.waitForElementVisible(`[data-id="block_tx${txHash}"]`, 60000)
+        browser
+          .waitForElementVisible(`[data-id="block_tx${txHash}"]`, 60000)
+          .moveToElement(`[data-id="block_tx${txHash}"]`, 0, 0)
+          .pause(2000)
           .click(`[data-id="block_tx${txHash}"]`)
           .pause(3000)
           .waitForElementVisible(`*[data-id="txLoggerTable${txHash}"]`, 60000)
         // fetch and format transaction logs as key => pair object
           .elements('css selector', `*[data-shared="key_${txHash}"]`, (res) => {
             Array.isArray(res.value) && res.value.forEach(function (jsonWebElement) {
-              const jsonWebElementId: string = jsonWebElement.ELEMENT || jsonWebElement[Object.keys(jsonWebElement)[0]]
+              const jsonWebElementId: string = jsonWebElement[ELEMENT_KEY] || jsonWebElement[Object.keys(jsonWebElement)[0]]
 
               browser.elementIdText(jsonWebElementId, (jsonElement) => {
                 const key = typeof jsonElement.value === 'string' ? jsonElement.value.trim() : null
@@ -40,7 +43,7 @@ class TestFunction extends EventEmitter {
           })
           .elements('css selector', `*[data-shared="pair_${txHash}"]`, (res) => {
             Array.isArray(res.value) && res.value.forEach(function (jsonWebElement, index) {
-              const jsonWebElementId = jsonWebElement.ELEMENT || jsonWebElement[Object.keys(jsonWebElement)[0]]
+              const jsonWebElementId = jsonWebElement[ELEMENT_KEY] || jsonWebElement[Object.keys(jsonWebElement)[0]]
 
               browser.elementIdText(jsonWebElementId, (jsonElement) => {
                 let value = jsonElement.value

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

@@ -7,7 +7,7 @@ class ValidateValueInput extends EventEmitter {
     browser.perform((done) => {
       browser.clearValue(selector)
         .pause(2000)
-        .setValue(selector, valueTosSet)
+        .setValue(selector, valueTosSet).pause(2000)
         .execute(function (selector) {
           const elem = document.querySelector(selector) as HTMLInputElement
           return elem.value

apps/remix-ide-e2e/src/helpers/init.ts

@@ -22,7 +22,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
       }, [loadPlugin])
       .refresh()
       .pause(6000)
-      .perform(done)
+      .perform(done())
     })
     .maximizeWindow()
     .fullscreenWindow(() => {

apps/remix-ide-e2e/src/select_tests.sh

@@ -3,7 +3,7 @@
 # Bash Menu Script Example
 
 PS3='Select a browser: '
-BROWSERS=( "chrome" "firefox" "exit" )
+BROWSERS=( "chrome" "chrome headless" "firefox" "exit" )
 select opt in "${BROWSERS[@]}"
 do
     case $opt in
@@ -12,6 +12,11 @@ do
             BROWSER="chromeDesktop"
             break
             ;;
+        "chrome headless")
+            echo "Chrome headless selected"
+            BROWSER="chrome"
+            break
+            ;;
         "firefox")
             echo "Firefox selected"
             BROWSER="firefoxDesktop"

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

@@ -21,7 +21,7 @@ module.exports = {
   'Should compile using "compileWithParamaters" API #group1': function (browser: NightwatchBrowser) {
     browser
       .addFile('test_jsCompile.js', { content: jsCompile })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', '"languageversion":"0.6.8+commit.0bbfe453"', 60000)
       .click('*[data-id="terminalClearConsole"]')
   },
@@ -29,7 +29,7 @@ module.exports = {
   'Should compile using "compileWithParamaters" API with optimization On #group2': function (browser: NightwatchBrowser) {
     browser
       .addFile('test_jsCompileWithOptimization.js', { content: jsCompileWithOptimization })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', '\\"optimizer\\":{\\"enabled\\":true,\\"runs\\":300}', 60000)
       .click('*[data-id="terminalClearConsole"]')
   },
@@ -37,7 +37,7 @@ module.exports = {
   'Should compile using "compileWithParamaters" API with optimization off check default runs #group3': function (browser: NightwatchBrowser) {
     browser
       .addFile('test_jsCompileWithOptimizationDefault.js', { content: jsCompileWithOptimizationDefault })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', '\\"optimizer\\":{\\"enabled\\":false,\\"runs\\":200}', 60000)
       .click('*[data-id="terminalClearConsole"]')
   },
@@ -45,7 +45,7 @@ module.exports = {
   'Should update the compiler configuration with "setCompilerConfig" API #group4': function (browser: NightwatchBrowser) {
     browser
       .addFile('test_updateConfiguration.js', { content: updateConfiguration })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .pause(15000)
       .addFile('test_updateConfiguration.sol', { content: simpleContract })
       .verifyContracts(['StorageTestUpdateConfiguration'], { wait: 5000, version: '0.6.8+commit.0bbfe453' })

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

@@ -192,7 +192,7 @@ module.exports = {
   'Should call the debugger api: getTrace #group4': function (browser: NightwatchBrowser) {
     browser
       .addFile('test_jsGetTrace.js', { content: jsGetTrace })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .pause(3000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', '{"gas":"0x575f","return":"0x0000000000000000000000000000000000000000000000000000000000000000","structLogs":', 60000)
   },
@@ -200,7 +200,7 @@ module.exports = {
   'Should call the debugger api: debug #group4': function (browser: NightwatchBrowser) {
     browser
       .addFile('test_jsDebug.js', { content: jsDebug })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .pause(3000)
       .clickLaunchIcon('debugger')
       .waitForElementVisible('*[data-id="slider"]')

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

@@ -42,7 +42,7 @@ module.exports = {
     browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
       .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORER')
       .clickLaunchIcon('filePanel')
-      .assert.hidden('div[data-id="remixIdeSidePanel"]')
+      .assert.not.visible('div[data-id="remixIdeSidePanel"]')
       .clickLaunchIcon('filePanel')
       .assert.visible('div[data-id="remixIdeSidePanel"]')
       .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORER')

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

@@ -89,7 +89,7 @@ module.exports = {
       .addFile('sourcehighlight.js', sourcehighlightScript)
       .addFile('removeAllSourcehighlightScript.js', removeAllSourcehighlightScript)
       .openFile('sourcehighlight.js')
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .scrollToLine(32)
       .waitForElementPresent('.highlightLine33', 60000)
       .checkElementStyle('.highlightLine33', 'background-color', 'rgb(52, 152, 219)')
@@ -105,7 +105,7 @@ module.exports = {
     browser.waitForElementVisible('li[data-id="treeViewLitreeViewItemremoveSourcehighlightScript.js"]')
       .click('li[data-id="treeViewLitreeViewItemremoveSourcehighlightScript.js"]')
       .pause(2000)
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementVisible('li[data-id="treeViewLitreeViewItemcontracts"]')
       .click('li[data-id="treeViewLitreeViewItemcontracts"]')
       .waitForElementVisible('li[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
@@ -119,7 +119,7 @@ module.exports = {
     browser.waitForElementVisible('li[data-id="treeViewLitreeViewItemremoveAllSourcehighlightScript.js"]')
       .click('li[data-id="treeViewLitreeViewItemremoveAllSourcehighlightScript.js"]')
       .pause(2000)
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementVisible('li[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
       .click('li[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
       .pause(2000)

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

@@ -10,12 +10,12 @@ const testData = {
 }
 
 module.exports = {
-
+  '@disabled': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
     init(browser, done)
   },
 
-  'Should create a new file `5_New_contract.sol` in file explorer': function (browser: NightwatchBrowser) {
+  'Should create a new file `5_New_contract.sol` in file explorer #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
       .clickLaunchIcon('filePanel')
       .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORER')
@@ -28,7 +28,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem5_New_contract.sol"]', 7000)
   },
 
-  'Should rename `5_New_contract.sol` to 5_Renamed_Contract.sol': function (browser: NightwatchBrowser) {
+  'Should rename `5_New_contract.sol` to 5_Renamed_Contract.sol #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem5_New_contract.sol"]')
       .click('*[data-id="treeViewLitreeViewItem5_New_contract.sol"]')
@@ -36,14 +36,14 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem5_Renamed_Contract.sol"]')
   },
 
-  'Should delete file `5_Renamed_Contract.sol` from file explorer': function (browser: NightwatchBrowser) {
+  'Should delete file `5_Renamed_Contract.sol` from file explorer #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem5_Renamed_Contract.sol"]')
       .removeFile('5_Renamed_Contract.sol', 'default_workspace')
       .waitForElementNotPresent('*[data-id="treeViewLitreeViewItem5_Renamed_Contract.sol"')
   },
 
-  'Should create a new folder': function (browser: NightwatchBrowser) {
+  'Should create a new folder #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.txt"]')
       .click('li[data-id="treeViewLitreeViewItemREADME.txt"]') // focus on root directory
@@ -55,7 +55,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemBrowser_Tests"]')
   },
 
-  'Should rename Browser_Tests folder to Browser_E2E_Tests': function (browser: NightwatchBrowser) {
+  'Should rename Browser_Tests folder to Browser_E2E_Tests #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemBrowser_Tests"]')
       .click('*[data-id="treeViewLitreeViewItemBrowser_Tests"]')
@@ -63,10 +63,10 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemBrowser_E2E_Tests"]')
   },
 
-  'Should delete Browser_E2E_Tests folder': function (browser: NightwatchBrowser) {
+  'Should delete Browser_E2E_Tests folder #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemBrowser_E2E_Tests"]')
-      .rightClick('[data-path="Browser_E2E_Tests"]')
+      .rightClickCustom('[data-path="Browser_E2E_Tests"]')
       .click('*[id="menuitemdelete"]')
       .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok', 60000)
       .pause(2000)
@@ -99,12 +99,16 @@ module.exports = {
       })
   },
 
-  'Should open local filesystem explorer': function (browser: NightwatchBrowser) {
-    browser.waitForElementVisible('*[data-id="filePanelFileExplorerTree"]')
+  'Should open local filesystem explorer #group2': function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementVisible('div[data-id="remixIdeSidePanel"]')
+      .clickLaunchIcon('filePanel')
+      .waitForElementVisible('*[data-id="filePanelFileExplorerTree"]')
       .click('[data-id="remixUIWorkspaceExplorer"]')
-      .setValue('*[data-id="fileExplorerFileUpload"]', testData.testFile1)
-      .setValue('*[data-id="fileExplorerFileUpload"]', testData.testFile2)
-      .setValue('*[data-id="fileExplorerFileUpload"]', testData.testFile3)
+      .waitForElementPresent('*[data-id="fileExplorerFileUpload"]')
+      .uploadFile('*[data-id="fileExplorerFileUpload"]', testData.testFile1)
+      .uploadFile('*[data-id="fileExplorerFileUpload"]', testData.testFile2)
+      .uploadFile('*[data-id="fileExplorerFileUpload"]', testData.testFile3)
       .waitForElementVisible('[data-id="treeViewLitreeViewItemeditor.test.js"]')
       .waitForElementVisible('[data-id="treeViewLitreeViewItemfileExplorer.test.js"]')
       .waitForElementVisible('[data-id="treeViewLitreeViewItemgeneralSettings.test.js"]')

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

@@ -11,7 +11,7 @@ module.exports = {
   'Should execute `file` api from file manager external api #group1': function (browser: NightwatchBrowser) {
     browser
       .addFile('file.js', { content: executeFile })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .pause(1000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'file.js', 60000)
   },
@@ -19,7 +19,7 @@ module.exports = {
   'Should execute `exists` api from file manager external api #group1': function (browser: NightwatchBrowser) {
     browser
       .addFile('exists.js', { content: executeExists })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'exists.js true', 60000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'non-exists.js false', 60000)
   },
@@ -27,14 +27,14 @@ module.exports = {
   'Should execute `open` api from file manager external api #group1': function (browser: NightwatchBrowser) {
     browser
       .addFile('open.js', { content: executeOpen })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'contracts/3_Ballot.sol', 60000)
   },
 
   'Should execute `writeFile` api from file manager external api #group1': function (browser: NightwatchBrowser) {
     browser
       .addFile('writeFile.js', { content: executeWriteFile })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .pause(2000)
       .openFile('new_contract.sol')
       .getEditorValue((content) => {
@@ -45,23 +45,23 @@ module.exports = {
   'Should execute `readFile` api from file manager external api #group2': function (browser: NightwatchBrowser) {
     browser
       .addFile('writeFile.js', { content: executeWriteFile })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .addFile('readFile.js', { content: executeReadFile })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'pragma solidity ^0.6.0', 60000)
   },
 
   'Should execute `copyFile` api from file manager external api #group2': function (browser: NightwatchBrowser) {
     browser
       .addFile('copyFile.js', { content: executeCopyFile })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'pragma solidity >=0.7.0 <0.9.0;', 60000)
   },
 
   'Should execute `rename` api from file manager external api #group2': function (browser: NightwatchBrowser) {
     browser
       .addFile('renameFile.js', { content: executeRename })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .pause(2000)
       .waitForElementPresent('[data-id="treeViewLitreeViewItemold_contract.sol"]', 60000)
   },
@@ -69,7 +69,7 @@ module.exports = {
   'Should execute `mkdir` api from file manager external api #group3': function (browser: NightwatchBrowser) {
     browser
       .addFile('mkdirFile.js', { content: executeMkdir })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .pause(2000)
       .waitForElementPresent('[data-id="treeViewLitreeViewItemTest_Folder"]', 80000)
   },
@@ -77,7 +77,7 @@ module.exports = {
   'Should execute `readdir` api from file manager external api #group3': function (browser: NightwatchBrowser) {
     browser
       .addFile('readdirFile.js', { content: executeReaddir })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Test_Folder isDirectory', 60000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'true', 5000)
   },
@@ -86,7 +86,7 @@ module.exports = {
     browser
       .addFile('old_contract.sol', { content: 'test' })
       .addFile('removeFile.js', { content: executeRemove })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .pause(2000)
       .waitForElementNotPresent('[data-id="treeViewLitreeViewItemold_contract.sol"]', 60000)
   },
@@ -95,7 +95,7 @@ module.exports = {
   'Should execute `remove` api from file manager external api on a folder #group4': function (browser: NightwatchBrowser) {
     browser
       .addFile('test_jsRemoveFolder.js', { content: executeRemoveOnFolder })
-      .executeScript('remix.exeCurrent()')
+      .executeScriptInTerminal('remix.exeCurrent()')
       .pause(2000)
       .waitForElementNotPresent('[data-id="treeViewLitreeViewItemcontracts"]', 60000)
       .end()

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

@@ -34,7 +34,7 @@ module.exports = {
       .sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemBrowser_Tests"]')
       .addFile('File.sol', { content: '' })
-      .executeScript(`remix.loadgist('${gistid}')`)
+      .executeScriptInTerminal(`remix.loadgist('${gistid}')`)
       // .perform((done) => { if (runtimeBrowser === 'chrome') { browser.openFile('gists') } done() })
       .waitForElementVisible(`[data-id="treeViewLitreeViewItemgist-${gistid}"]`)
       .click(`[data-id="treeViewLitreeViewItemgist-${gistid}"]`)
@@ -58,7 +58,7 @@ module.exports = {
           const gistid = id[1]
           browser
             .click('[data-id="default_workspace-modal-footer-cancel-react"]')
-            .executeScript(`remix.loadgist('${gistid}')`)
+            .executeScriptInTerminal(`remix.loadgist('${gistid}')`)
             // .perform((done) => { if (runtimeBrowser === 'chrome') { browser.openFile('gists') } done() })
             .waitForElementVisible(`[data-id="treeViewLitreeViewItemgist-${gistid}"]`)
             .click(`[data-id="treeViewLitreeViewItemgist-${gistid}"]`)

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

@@ -37,8 +37,8 @@ module.exports = {
       .setValue('input[data-id="homeTabModalDialogCustomPromptText"]', testData.invalidURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
       .click('[data-id="homeTab-modal-footer-ok-react"]') // submitted
-      .waitForElementVisible('*[data-shared="tooltipPopup"]')
-      .assert.containsText('*[data-shared="tooltipPopup"] span', 'not found ' + testData.invalidURL)
+      //.waitForElementVisible('*[data-shared="tooltipPopup"]')
+      //.waitForElementContainsText('*[data-shared="tooltipPopup"] span', 'not found ' + testData.invalidURL)
   },
 
   'Import From GitHub For Valid URL #group2': function (browser: NightwatchBrowser) {

apps/remix-ide-e2e/src/tests/plugin_api.ts

@@ -214,7 +214,7 @@ module.exports = {
           }
         })
         .waitForElementVisible('[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]')
-        .rightClick('[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]').useXpath().waitForElementVisible('//*[@id="menuitemtestcommand"]').click('//*[@id="menuitemtestcommand"]', async () => {
+        .rightClickCustom('[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]').useXpath().waitForElementVisible('//*[@id="menuitemtestcommand"]').click('//*[@id="menuitemtestcommand"]', async () => {
           // @ts-ignore
           browser.click('//*[@data-id="verticalIconsKindlocalPlugin"]').frame(0, async () => {
             await clickAndCheckLog(browser, null, { id: 'localPlugin', name: 'testCommand', label: 'testCommand', type: [], extension: ['.sol'], path: ['contracts/1_Storage.sol'], pattern: [] }, null, null)
@@ -321,14 +321,14 @@ module.exports = {
   // DGIT
   'Should have changes on new workspace #group3': async function (browser: NightwatchBrowser) {
     await clickAndCheckLog(browser, 'filePanel:createWorkspace', null, null, 'dgit')
-    await clickAndCheckLog(browser, 'dGitProvider:status', [['README.txt', 0, 2, 0], ['contracts/1_Storage.sol', 0, 2, 0], ['contracts/2_Owner.sol', 0, 2, 0], ['contracts/3_Ballot.sol', 0, 2, 0], ['scripts/deploy_with_ethers.ts', 0, 2, 0], ['scripts/deploy_with_web3.ts', 0, 2, 0], ['tests/Ballot_test.sol', 0, 2, 0]], ['tests/storage.test.js', 0, 2, 0], null, null)
+    await clickAndCheckLog(browser, 'dGitProvider:status', [["README.txt",0,2,0],["contracts/1_Storage.sol",0,2,0],["contracts/2_Owner.sol",0,2,0],["contracts/3_Ballot.sol",0,2,0],["scripts/deploy_with_ethers.ts",0,2,0],["scripts/deploy_with_web3.ts",0,2,0],["scripts/ethers-lib.ts",0,2,0],["scripts/web3-lib.ts",0,2,0],["tests/Ballot_test.sol",0,2,0],["tests/storage.test.js",0,2,0]], null, null)
   },
 
   'Should stage contract #group3': async function (browser: NightwatchBrowser) {
     await clickAndCheckLog(browser, 'dGitProvider:add', null, null, {
       filepath: 'contracts/1_Storage.sol'
     })
-    await clickAndCheckLog(browser, 'dGitProvider:status', [['README.txt', 0, 2, 0], ['contracts/1_Storage.sol', 0, 2, 2], ['contracts/2_Owner.sol', 0, 2, 0], ['contracts/3_Ballot.sol', 0, 2, 0], ['scripts/deploy_with_ethers.ts', 0, 2, 0], ['scripts/deploy_with_web3.ts', 0, 2, 0], ['tests/Ballot_test.sol', 0, 2, 0]], ['tests/storage.test.js', 0, 2, 0], null, null)
+    await clickAndCheckLog(browser, 'dGitProvider:status', [["README.txt",0,2,0],["contracts/1_Storage.sol",0,2,2],["contracts/2_Owner.sol",0,2,0],["contracts/3_Ballot.sol",0,2,0],["scripts/deploy_with_ethers.ts",0,2,0],["scripts/deploy_with_web3.ts",0,2,0],["scripts/ethers-lib.ts",0,2,0],["scripts/web3-lib.ts",0,2,0],["tests/Ballot_test.sol",0,2,0],["tests/storage.test.js",0,2,0]], null, null)
   },
   'Should commit changes #group3': async function (browser: NightwatchBrowser) {
     await clickAndCheckLog(browser, 'dGitProvider:commit', null, null, { author: { name: 'Remix', email: 'Remix' }, message: 'commit-message' })
@@ -417,7 +417,7 @@ module.exports = {
       .frameParent()
       .useCss()
       .addFile('test_modal.js', { content: testModalToasterApi })
-      .executeScript('remix.execute(\'test_modal.js\')')
+      .executeScriptInTerminal('remix.execute(\'test_modal.js\')')
       .useCss()
       .waitForElementVisible('*[data-id="test_id_1_ModalDialogModalBody-react"]', 60000)
       .assert.containsText('*[data-id="test_id_1_ModalDialogModalBody-react"]', 'message 1')

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

@@ -55,6 +55,7 @@ module.exports = {
   },
   'start Remixd': function (browser) {
     startRemixd(browser)
+
   },
   'run Remixd tests #group4': function (browser) {
     runTests(browser)
@@ -102,7 +103,7 @@ module.exports = {
 
   'Run git status': '' + function (browser) {
     browser
-      .executeScript('git status')
+      .executeScriptInTerminal('git status')
       .pause(3000)
       .journalLastChildIncludes('On branch ')
   },
@@ -131,6 +132,7 @@ function startRemixd (browser: NightwatchBrowser) {
     .waitForElementVisible('*[data-id="remixdConnect-modal-footer-ok-react"]', 2000)
     .pause(2000)
     .click('*[data-id="remixdConnect-modal-footer-ok-react"]')
+    .pause(10000)
     // .click('*[data-id="workspacesModalDialog-modal-footer-ok-react"]')
 }
 

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

@@ -39,8 +39,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="signMessageTextarea"]', 120000)
       .click('*[data-id="signMessageTextarea"]')
       .setValue('*[data-id="signMessageTextarea"]', 'Remix is cool!')
-      .assert.elementNotPresent('*[data-id="settingsRemixRunSignMsgHash"]')
-      .assert.elementNotPresent('*[data-id="settingsRemixRunSignMsgSignature"]')
+      .assert.not.elementPresent('*[data-id="settingsRemixRunSignMsgHash"]')
+      .assert.not.elementPresent('*[data-id="settingsRemixRunSignMsgSignature"]')
       .pause(2000)
       .waitForElementPresent('[data-id="udappNotify-modal-footer-ok-react"]')
       .click('[data-id="udappNotify-modal-footer-ok-react"]')
@@ -80,7 +80,7 @@ module.exports = {
       .end()
   },
 
-  'Should connect to Goerli Test Network using MetaMask': '' + function (browser: NightwatchBrowser) {
+  'Should connect to Goerli Test Network using MetaMask': !function (browser: NightwatchBrowser) {
     browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
       .setupMetamask(passphrase, password)
       .click('.network-indicator__down-arrow')
@@ -101,7 +101,7 @@ module.exports = {
       .switchBrowserTab(0)
   },
 
-  'Should deploy contract on Goerli Test Network using MetaMask': '' + function (browser: NightwatchBrowser) {
+  'Should deploy contract on Goerli Test Network using MetaMask': !function (browser: NightwatchBrowser) {
     browser.waitForElementPresent('*[data-id="runTabSelectAccount"] option')
       .clickLaunchIcon('filePanel')
       .openFile('Greet.sol')
@@ -118,7 +118,7 @@ module.exports = {
       .switchBrowserTab(0)
   },
 
-  'Should run low level interaction (fallback function) on Goerli Test Network using MetaMask': '' + function (browser: NightwatchBrowser) {
+  'Should run low level interaction (fallback function) on Goerli Test Network using MetaMask': !function (browser: NightwatchBrowser) {
     browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
       .waitForElementPresent('*[data-id="universalDappUiTitleExpander"]')
       .click('*[data-id="universalDappUiTitleExpander"]')
@@ -135,7 +135,7 @@ module.exports = {
       .end()
   },
 
-  'Should connect to Ethereum Main Network using MetaMask': '' + function (browser: NightwatchBrowser) {
+  'Should connect to Ethereum Main Network using MetaMask': !function (browser: NightwatchBrowser) {
     browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
       .switchBrowserTab(2)
       .waitForElementPresent('.network-indicator__down-arrow')
@@ -153,7 +153,7 @@ module.exports = {
       .assert.containsText('*[data-id="settingsNetworkEnv"]', 'Main (1) network')
   },
 
-  'Should deploy contract on Ethereum Main Network using MetaMask': '' + function (browser: NightwatchBrowser) {
+  'Should deploy contract on Ethereum Main Network using MetaMask': !function (browser: NightwatchBrowser) {
     browser.waitForElementPresent('*[data-id="runTabSelectAccount"] option')
       .clickLaunchIcon('filePanel')
       .openFile('Greet.sol')
@@ -173,7 +173,7 @@ module.exports = {
    * - Ropsten node for retrieving the trace and storage
    *
    */
-  'Should debug Ropsten transaction with source highlighting using the source verifier service and MetaMask': '' + function (browser: NightwatchBrowser) {
+  'Should debug Ropsten transaction with source highlighting using the source verifier service and MetaMask': !function (browser: NightwatchBrowser) {
     browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .switchBrowserTab(2)
@@ -198,9 +198,9 @@ module.exports = {
       .assert.containsText('*[data-id="solidityLocals"]', 'to: 0x6C3CCC7FBA111707D5A1AAF2758E9D4F4AC5E7B1')
   },
 
-  'Call web3.eth.getAccounts() using Injected Provider (Metamask)': '' + function (browser: NightwatchBrowser) {
+  'Call web3.eth.getAccounts() using Injected Provider (Metamask)': !function (browser: NightwatchBrowser) {
     browser
-      .executeScript('web3.eth.getAccounts()')
+      .executeScriptInTerminal('web3.eth.getAccounts()')
       .pause(2000)
       .journalLastChildIncludes('[ "0x76a3ABb5a12dcd603B52Ed22195dED17ee82708f" ]')
       .end()

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

@@ -12,7 +12,7 @@ module.exports = {
         browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]')
             .click('*[plugin="search"]').waitForElementVisible('*[id="search_input"]')
             .waitForElementVisible('*[id="search_include"]')
-            .setValue('*[id="search_include"]', ', *.txt').pause(2000)
+            .setValue('*[id="search_include"]', ', *.*').pause(2000)
             .setValue('*[id="search_input"]', 'read').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
             .pause(1000)
             .waitForElementContainsText('*[data-id="search_results"]', '3_BALLOT.SOL', 60000)
@@ -100,7 +100,7 @@ module.exports = {
         browser.click('*[data-id="confirm_replace_label"]').pause(500)
             .clearValue('*[id="search_input"]')
             .setValue('*[id="search_input"]', 'replacing').sendKeys('*[id="search_input"]', browser.Keys.ENTER).pause(1000)
-            .setValue('*[id="search_replace"]', '2').pause(1000)
+            .setValue('*[id="search_replace"]', 'replacing2').pause(1000)
             .waitForElementVisible('*[data-id="contracts/2_Owner.sol-33-71"]')
             .moveToElement('*[data-id="contracts/2_Owner.sol-33-71"]', 10, 10)
             .waitForElementVisible('*[data-id="replace-contracts/2_Owner.sol-33-71"]')

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

@@ -177,10 +177,16 @@ module.exports = {
       // creating a new workspace
       .click('*[data-id="workspaceCreate"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-      // eslint-disable-next-line dot-notation
-      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_new' })
+      .click('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]')
+      .setValue('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_new')
+      .pause(2000)
+      .getValue('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]', (result) => {
+        console.log(result)
+        browser.assert.equal(result.value, 'workspace_new')
+      })
       .waitForElementVisible('*[data-id="fileSystem-modal-footer-ok-react"]')
-      .execute(function () { (document.querySelector('[data-id="fileSystem-modal-footer-ok-react"]') as HTMLElement).click() })
+      .click('*[data-id="fileSystem-modal-footer-ok-react"]')
+      .pause(3000)
       .currentWorkspaceIs('workspace_new')
       .waitForElementVisible('li[data-id="treeViewLitreeViewItem.deps/remix-tests/remix_tests.sol"]')
       .waitForElementVisible('li[data-id="treeViewLitreeViewItem.deps/remix-tests/remix_accounts.sol"]')

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

@@ -33,7 +33,7 @@ module.exports = {
             .journalLastChildIncludes('to: CheckSpecials.(fallback)')
             .journalLastChildIncludes('value: 0 wei')
             .journalLastChildIncludes('data: 0xaa')
-            .perform(done)
+            .perform(done())
         })
       })
   },
@@ -46,7 +46,7 @@ module.exports = {
           .pause(1000)
           .waitForElementVisible(`#instance${address} label[id="deployAndRunLLTxError"]`)
           .assert.containsText(`#instance${address} label[id="deployAndRunLLTxError"]`, 'The calldata should be a valid hexadecimal value with size of at least one byte.')
-          .perform(done)
+          .perform(done())
       })
     })
   },
@@ -58,7 +58,7 @@ module.exports = {
           .pause(1000)
           .waitForElementVisible(`#instance${address} label[id="deployAndRunLLTxError"]`)
           .assert.containsText(`#instance${address} label[id="deployAndRunLLTxError"]`, 'The calldata should be a valid hexadecimal value.')
-          .perform(done)
+          .perform(done())
       })
     })
   },
@@ -71,7 +71,7 @@ module.exports = {
           .journalLastChildIncludes('to: CheckSpecials.(receive)')
           .journalLastChildIncludes('value: 1 wei')
           .journalLastChildIncludes('data: 0x')
-          .perform(done)
+          .perform(done())
       })
     })
   },
@@ -83,7 +83,7 @@ module.exports = {
           .pause(1000)
           .journalLastChildIncludes('to CheckSpecials.(fallback) errored:')
           .journalLastChildIncludes('The called function should be payable if you send value')
-          .perform(done)
+          .perform(done())
       })
     })
   },
@@ -101,7 +101,7 @@ module.exports = {
             .journalLastChildIncludes('to: CheckSpecials.(receive)')
             .journalLastChildIncludes('value: 1 wei')
             .journalLastChildIncludes('data: 0x')
-            .perform(done)
+            .perform(done())
         })
       })
   },
@@ -113,7 +113,7 @@ module.exports = {
           .pause(1000)
           .waitForElementVisible(`#instance${address} label[id="deployAndRunLLTxError"]`)
           .assert.containsText(`#instance${address} label[id="deployAndRunLLTxError"]`, '\'Fallback\' function is not defined')
-          .perform(done)
+          .perform(done())
       })
     })
   },
@@ -131,7 +131,7 @@ module.exports = {
             .journalLastChildIncludes('to: CheckSpecials.(fallback)')
             .journalLastChildIncludes('value: 1 wei')
             .journalLastChildIncludes('data: 0x')
-            .perform(done)
+            .perform(done())
         })
       })
   },
@@ -144,7 +144,7 @@ module.exports = {
           .journalLastChildIncludes('to: CheckSpecials.(fallback)')
           .journalLastChildIncludes('value: 1 wei')
           .journalLastChildIncludes('data: 0xaa')
-          .perform(done)
+          .perform(done())
       })
     })
   },
@@ -161,7 +161,7 @@ module.exports = {
             .pause(1000)
             .waitForElementVisible(`#instance${address} label[id="deployAndRunLLTxError"]`)
             .assert.containsText(`#instance${address} label[id="deployAndRunLLTxError"]`, 'should have either \'receive\' or payable \'fallback\'')
-            .perform(done)
+            .perform(done())
         })
       })
   },
@@ -184,7 +184,7 @@ module.exports = {
             .journalLastChildIncludes('to: CheckSpecials.(fallback)')
             .journalLastChildIncludes('value: 999999998765257135 wei')
             .journalLastChildIncludes('data: 0xaa')
-            .perform(done)
+            .perform(done())
         })
       })
   },
@@ -196,7 +196,7 @@ module.exports = {
           .journalLastChildIncludes('to: CheckSpecials.(receive)')
           .journalLastChildIncludes('value: 1 wei')
           .journalLastChildIncludes('data: 0x')
-          .perform(done)
+          .perform(done())
       })
     })
   },
@@ -217,7 +217,7 @@ module.exports = {
             .pause(1000)
             .waitForElementVisible(`#instance${address} label[id="deployAndRunLLTxError"]`)
             .assert.containsText(`#instance${address} label[id="deployAndRunLLTxError"]`, 'Both \'receive\' and \'fallback\' functions are not defined')
-            .perform(done)
+            .perform(done())
         })
       })
       .end()

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

@@ -42,7 +42,7 @@ module.exports = {
     .waitForElementPresent('#staticanalysisresult .warning', 5000)
     .assert.containsText('#verticalIconsKindsolidityStaticAnalysis .remixui_status', '1') // Check warning count
     .verify.elementPresent('input[name="showLibWarnings"]')
-    .verify.elementNotPresent('input[name="showLibWarnings"]:checked')
+    .verify.not.elementPresent('input[name="showLibWarnings"]:checked')
     .verify.elementPresent('label[id="headingshowLibWarnings"]')
     .click('label[id="headingshowLibWarnings"]')
     .pause(1000)
@@ -62,7 +62,7 @@ function runTests (browser: NightwatchBrowser) {
     .testContracts('Untitled.sol', sources[0]['Untitled.sol'], ['TooMuchGas', 'test1', 'test2'])
     .clickLaunchIcon('solidityStaticAnalysis')
     .click('#staticanalysisButton button')
-    .waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () {
+    .waitForElementPresent('#staticanalysisresult .warning', 2000, 500, true, function () {
       listSelectorContains(['Use of tx.origin',
         'Fallback function of contract TooMuchGas requires too much gas',
         'TooMuchGas.() : Variables have very similar names "test" and "test1".',

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

@@ -10,7 +10,7 @@ module.exports = {
   'Should execution a simple console command #group1 #group999': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="terminalCli"]', 10000)
-      .executeScript('console.log(1 + 1)')
+      .executeScriptInTerminal('console.log(1 + 1)')
       .pause(2000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', '2', 60000)
   },
@@ -26,7 +26,7 @@ module.exports = {
   'Async/Await Script #group1': function (browser: NightwatchBrowser) {
     browser
       .addFile('asyncAwait.js', { content: asyncAwait })
-      .executeScript('remix.execute("asyncAwait.js")')
+      .executeScriptInTerminal('remix.execute("asyncAwait.js")')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Waiting Promise', 60000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'result - ', 60000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Promise Resolved', 60000)
@@ -35,13 +35,13 @@ module.exports = {
   'Call Remix File Manager from a script #group2': function (browser: NightwatchBrowser) {
     browser
       .addFile('asyncAwaitWithFileManagerAccess.js', { content: asyncAwaitWithFileManagerAccess })
-      .executeScript('remix.execute(\'asyncAwaitWithFileManagerAccess.js\')')
+      .executeScriptInTerminal('remix.execute(\'asyncAwaitWithFileManagerAccess.js\')')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'contract Ballot {', 60000)
   },
 
   'Call web3.eth.getAccounts() using Remix VM #group2': function (browser: NightwatchBrowser) {
     browser
-      .executeScript('web3.eth.getAccounts()')
+      .executeScriptInTerminal('web3.eth.getAccounts()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', '["0x5B38Da6a701c568545dCfcB03FcB875f56beddC4","0xAb8483F64d9C6d1EcF9b849Ae677dD3315835cb2","0x4B20993Bc481177ec7E8f571ceCaE8A9e22C02db","0x78731D3Ca6b7E34aC0F824c42a7cC18A495cabaB","0x617F2E2fD72FD9D5503197092aC168c91465E7f2","0x17F6AD8Ef982297579C203069C1DbfFE4348c372","0x5c6B0f7Bf3E7ce046039Bd8FABdfD3f9F5021678","0x03C6FcED478cBbC9a4FAB34eF9f40767739D1Ff7","0x1aE0EA34a72D944a8C7603FfB3eC30a6669E454C","0x0A098Eda01Ce92ff4A4CCb7A4fFFb5A43EBC70DC","0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c","0x14723A09ACff6D2A60DcdF7aA4AFf308FDDC160C","0x4B0897b0513fdC7C541B6d9D7E929C4e5364D2dB","0x583031D1113aD414F02576BD6afaBfb302140225","0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]')
   },
 
@@ -51,7 +51,7 @@ module.exports = {
       .clickLaunchIcon('udapp')
       .switchEnvironment('External Http Provider')
       .modalFooterOKClick('basic-http-provider')
-      .executeScript('web3.eth.getAccounts()')
+      .executeScriptInTerminal('web3.eth.getAccounts()')
       .waitForElementContainsText('*[data-id="terminalJournal"]', '["', 60000) // we check if an array is present, don't need to check for the content
       .waitForElementContainsText('*[data-id="terminalJournal"]', '"]', 60000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', '","', 60000)
@@ -63,7 +63,7 @@ module.exports = {
       .addFile('resolveExternalUrlAndSave.js', { content: resolveExternalUrlAndSave })
       .openFile('resolveExternalUrlAndSave.js')
       .pause(1000)
-      .executeScript('remix.execute(\'resolveExternalUrlAndSave.js\')')
+      .executeScriptInTerminal('remix.execute(\'resolveExternalUrlAndSave.js\')')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Implementation of the {IERC20} interface.', 60000)
       .openFile('.deps/github/OpenZeppelin/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol')
   },
@@ -74,7 +74,7 @@ module.exports = {
       .addFile('resolveUrl.js', { content: resolveUrl })
       .openFile('resolveUrl.js')
       .pause(1000)
-      .executeScript('remix.execute(\'resolveUrl.js\')')
+      .executeScriptInTerminal('remix.execute(\'resolveUrl.js\')')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'contract Ballot {', 60000)
   },
 
@@ -84,7 +84,7 @@ module.exports = {
       .addFile('resolveExternalUrlAndSaveToaPath.js', { content: resolveExternalUrlAndSaveToaPath })
       .openFile('resolveExternalUrlAndSaveToaPath.js')
       .pause(1000)
-      .executeScript('remix.execute(\'resolveExternalUrlAndSaveToaPath.js\')')
+      .executeScriptInTerminal('remix.execute(\'resolveExternalUrlAndSaveToaPath.js\')')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'abstract contract ERC20Burnable', 60000)
       .openFile('.deps/github/newFile.sol')
 
@@ -105,7 +105,7 @@ module.exports = {
       .openFile('contracts/2_Owner.sol')
       .clickLaunchIcon('solidity')
       .click('*[data-id="compilerContainerCompileBtn"]').pause(5000) // compile Owner
-      .executeScript('remix.execute(\'deployWithEthersJs.js\')')
+      .executeScriptInTerminal('remix.execute(\'deployWithEthersJs.js\')')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Contract Address:', 60000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', '0xd9145CCE52D386f254917e481eB44e9943F39138', 60000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Deployment successful.', 60000)
@@ -127,7 +127,7 @@ module.exports = {
       .clickLaunchIcon('solidity')
       .click('*[data-id="compilerContainerCompileBtn"]')
       .pause(1000) // compile Storage
-      .executeScript('remix.execute(\'scripts/storage.test.js\')')
+      .executeScriptInTerminal('remix.execute(\'scripts/storage.test.js\')')
       .pause(1000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Running tests....')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'storage contract Address:')
@@ -149,7 +149,7 @@ module.exports = {
       .clickLaunchIcon('solidity')
       .click('*[data-id="compilerContainerCompileBtn"]')
       .pause(1000) // compile StorageWithLib
-      .executeScript('remix.execute(\'scripts/storageWithLib.test.js\')')
+      .executeScriptInTerminal('remix.execute(\'scripts/storageWithLib.test.js\')')
       .pause(1000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Running tests....')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Storage with lib')

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

@@ -23,8 +23,8 @@ module.exports = {
           status: 'true Transaction mined and execution succeed',
           'decoded output': { 0: 'uint256: 8' }
         })
-      .pause(500)
-      .checkTerminalFilter('0x12332162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92782', '')
+      .pause(120000)
+      //.checkTerminalFilter('0x12332162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92782', '')
       .clickFunction('g - transact (not payable)')
       .testFunction('last',
         {

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

@@ -9,13 +9,14 @@ const sources = [
 ]
 
 module.exports = {
+  '@disabled': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
     init(browser, done)
   },
   '@sources': function () {
     return sources
   },
-  'The sequence: Compiling / Deploying / Compiling another contract / calling the first contract - should display in the log the transaction with all the decoded information': function (browser: NightwatchBrowser) {
+  'The sequence: Compiling / Deploying / Compiling another contract / calling the first contract - should display in the log the transaction with all the decoded information #group1': function (browser: NightwatchBrowser) {
     // https://github.com/ethereum/remix-ide/issues/2864
     browser
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
@@ -36,8 +37,7 @@ module.exports = {
       .clickLaunchIcon('solidity')
       .testContracts('Untitled1.sol', sources[1]['Untitled1.sol'], ['test'])
       .clickLaunchIcon('udapp')
-      .clickFunction('delegate - transact (not payable)', { types: 'address to', values: '' })
-      .pause(5000)
+      .clickFunction('delegate - transact (not payable)', { types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"' })
       .testFunction('last',
         {
           status: 'false Transaction mined but execution failed',

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

@@ -41,6 +41,7 @@ const sources = [
 ]
 
 module.exports = {
+  '@disabled': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
     init(browser, done, 'http://127.0.0.1:8080/#optimize=true&runs=300&evmVersion=istanbul&version=soljson-v0.7.4+commit.3f05b770.js', true)
   },
@@ -49,7 +50,7 @@ module.exports = {
     return sources
   },
 
-  'Should load the code from URL params (code param)': function (browser: NightwatchBrowser) {
+  'Should load the code from URL params (code param) #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('[for="autoCompile"]')
       .click('[for="autoCompile"]') // we set it too false in the local storage
@@ -66,11 +67,11 @@ module.exports = {
       .getEditorValue((content) => {
         browser.assert.ok(content && content.indexOf(
           'https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/access/Ownable.sol') !== -1,
-        'code has not been loaded')
+          'code has not been loaded')
       })
   },
 
-  'Should load the code from URL params (url param)': function (browser: NightwatchBrowser) {
+  'Should load the code from URL params (url param) #group1': function (browser: NightwatchBrowser) {
     browser
       .pause(5000)
       .url('http://127.0.0.1:8080/#optimize=true&runs=300&evmVersion=istanbul&version=soljson-v0.7.4+commit.3f05b770.js&url=https://github.com/ethereum/remix-project/blob/master/apps/remix-ide/contracts/app/solidity/mode.sol')
@@ -80,11 +81,40 @@ module.exports = {
       .getEditorValue((content) => {
         browser.assert.ok(content && content.indexOf(
           'proposals.length = _numProposals;') !== -1,
-        'url has not been loaded')
+          'url has not been loaded')
       })
   },
 
-  'Should load the code from URL & code params': function (browser: NightwatchBrowser) {
+  'Should load Etherscan verified contractss from URL "address" param) #group2': function (browser: NightwatchBrowser) {
+    browser
+      .pause(5000)
+      .url('http://127.0.0.1:8080/#address=0x56db08fb78bc6689a1ef66efd079083fed0e4915')
+      .refresh()
+      .pause(7000)
+      .currentWorkspaceIs('etherscan-code-sample')
+      .assert.elementPresent('*[data-id=treeViewLitreeViewItemropsten]')
+      .assert.elementPresent('*[data-id=treeViewLitreeViewItemrinkeby]')
+      .assert.elementPresent('*[data-id="treeViewLitreeViewItemrinkeby/0x56db08fb78bc6689a1ef66efd079083fed0e4915"]')
+      .assert.elementPresent('*[data-id="treeViewLitreeViewItemrinkeby/0x56db08fb78bc6689a1ef66efd079083fed0e4915/Sample.sol"]')
+      .getEditorValue((content) => {
+        browser.assert.ok(content && content.indexOf(
+          'contract Sample {') !== -1)
+      })
+      .url('http://127.0.0.1:8080/#address=0xdac17f958d2ee523a2206206994597c13d831ec7')
+      .refresh()
+      .pause(7000)
+      .currentWorkspaceIs('etherscan-code-sample')
+      .assert.elementPresent('*[data-id=treeViewLitreeViewItemmainnet]')
+      .assert.elementPresent('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7"]')
+      .assert.elementPresent('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7/TetherToken.sol"]')
+      .getEditorValue((content) => {
+        browser.assert.ok(content && content.indexOf(
+          'contract TetherToken is Pausable, StandardToken, BlackList {') !== -1)
+
+      })
+  },
+
+  'Should load the code from URL & code params #group1': function (browser: NightwatchBrowser) {
     browser
       .pause(5000)
       .url('http://127.0.0.1:8080/#optimize=true&runs=300&evmVersion=istanbul&version=soljson-v0.7.4+commit.3f05b770.js&url=https://github.com/ethereum/remix-project/blob/master/apps/remix-ide/contracts/app/solidity/mode.sol&code=cHJhZ21hIHNvbGlkaXR5ID49MC42LjAgPDAuNy4wOwoKaW1wb3J0ICJodHRwczovL2dpdGh1Yi5jb20vT3BlblplcHBlbGluL29wZW56ZXBwZWxpbi1jb250cmFjdHMvYmxvYi9tYXN0ZXIvY29udHJhY3RzL2FjY2Vzcy9Pd25hYmxlLnNvbCI7Cgpjb250cmFjdCBHZXRQYWlkIGlzIE93bmFibGUgewogIGZ1bmN0aW9uIHdpdGhkcmF3KCkgZXh0ZXJuYWwgb25seU93bmVyIHsKICB9Cn0')
@@ -95,7 +125,7 @@ module.exports = {
       .getEditorValue((content) => {
         browser.assert.ok(content && content.indexOf(
           'proposals.length = _numProposals;') !== -1,
-        'code has not been loaded')
+          'code has not been loaded')
       })
       .openFile('contract-76747f6e19.sol')
       .openFile('ethereum')
@@ -108,7 +138,7 @@ module.exports = {
       .openFile('ethereum/remix-project/apps/remix-ide/contracts/app/solidity/mode.sol')
   },
 
-  'Should load the code from language & code params': function (browser: NightwatchBrowser) {
+  'Should load the code from language & code params #group1': function (browser: NightwatchBrowser) {
     browser
       .pause(5000)
       .url('http://127.0.0.1:8080/#language=yul&version=soljson-v0.8.7+commit.e28d00a7.js&code=Ly8gQSBjb250cmFjdCBjb25zaXN0cyBvZiBhIHNpbmdsZSBvYmplY3Qgd2l0aCBzdWItb2JqZWN0cyByZXByZXNlbnRpbmcKLy8gdGhlIGNvZGUgdG8gYmUgZGVwbG95ZWQgb3Igb3RoZXIgY29udHJhY3RzIGl0IGNhbiBjcmVhdGUuCi8vIFRoZSBzaW5nbGUgImNvZGUiIG5vZGUgaXMgdGhlIGV4ZWN1dGFibGUgY29kZSBvZiB0aGUgb2JqZWN0LgovLyBFdmVyeSAob3RoZXIpIG5hbWVkIG9iamVjdCBvciBkYXRhIHNlY3Rpb24gaXMgc2VyaWFsaXplZCBhbmQKLy8gbWFkZSBhY2Nlc3NpYmxlIHRvIHRoZSBzcGVjaWFsIGJ1aWx0LWluIGZ1bmN0aW9ucyBkYXRhY29weSAvIGRhdGFvZmZzZXQgLyBkYXRhc2l6ZQovLyBUaGUgY3VycmVudCBvYmplY3QsIHN1Yi1vYmplY3RzIGFuZCBkYXRhIGl0ZW1zIGluc2lkZSB0aGUgY3VycmVudCBvYmplY3QKLy8gYXJlIGluIHNjb3BlLgpvYmplY3QgIkNvbnRyYWN0MSIgewogICAgLy8gVGhpcyBpcyB0aGUgY29uc3RydWN0b3IgY29kZSBvZiB0aGUgY29udHJhY3QuCiAgICBjb2RlIHsKICAgICAgICBmdW5jdGlvbiBhbGxvY2F0ZShzaXplKSAtPiBwdHIgewogICAgICAgICAgICBwdHIgOj0gbWxvYWQoMHg0MCkKICAgICAgICAgICAgaWYgaXN6ZXJvKHB0cikgeyBwdHIgOj0gMHg2MCB9CiAgICAgICAgICAgIG1zdG9yZSgweDQwLCBhZGQocHRyLCBzaXplKSkKICAgICAgICB9CgogICAgICAgIC8vIGZpcnN0IGNyZWF0ZSAiQ29udHJhY3QyIgogICAgICAgIGxldCBzaXplIDo9IGRhdGFzaXplKCJDb250cmFjdDIiKQogICAgICAgIGxldCBvZmZzZXQgOj0gYWxsb2NhdGUoc2l6ZSkKICAgICAgICAvLyBUaGlzIHdpbGwgdHVybiBpbnRvIGNvZGVjb3B5IGZvciBFVk0KICAgICAgICBkYXRhY29weShvZmZzZXQsIGRhdGFvZmZzZXQoIkNvbnRyYWN0MiIpLCBzaXplKQogICAgICAgIC8vIGNvbnN0cnVjdG9yIHBhcmFtZXRlciBpcyBhIHNpbmdsZSBudW1iZXIgMHgxMjM0CiAgICAgICAgbXN0b3JlKGFkZChvZmZzZXQsIHNpemUpLCAweDEyMzQpCiAgICAgICAgcG9wKGNyZWF0ZShvZmZzZXQsIGFkZChzaXplLCAzMiksIDApKQoKICAgICAgICAvLyBub3cgcmV0dXJuIHRoZSBydW50aW1lIG9iamVjdCAodGhlIGN1cnJlbnRseQogICAgICAgIC8vIGV4ZWN1dGluZyBjb2RlIGlzIHRoZSBjb25zdHJ1Y3RvciBjb2RlKQogICAgICAgIHNpemUgOj0gZGF0YXNpemUoIkNvbnRyYWN0MV9kZXBsb3llZCIpCiAgICAgICAgb2Zmc2V0IDo9IGFsbG9jYXRlKHNpemUpCiAgICAgICAgLy8gVGhpcyB3aWxsIHR1cm4gaW50byBhIG1lbW9yeS0+bWVtb3J5IGNvcHkgZm9yIEV3YXNtIGFuZAogICAgICAgIC8vIGEgY29kZWNvcHkgZm9yIEVWTQogICAgICAgIGRhdGFjb3B5KG9mZnNldCwgZGF0YW9mZnNldCgiQ29udHJhY3QxX2RlcGxveWVkIiksIHNpemUpCiAgICAgICAgcmV0dXJuKG9mZnNldCwgc2l6ZSkKICAgIH0KCiAgICBkYXRhICJUYWJsZTIiIGhleCI0MTIzIgoKICAgIG9iamVjdCAiQ29udHJhY3QxX2RlcGxveWVkIiB7CiAgICAgICAgY29kZSB7CiAgICAgICAgICAgIGZ1bmN0aW9uIGFsbG9jYXRlKHNpemUpIC0+IHB0ciB7CiAgICAgICAgICAgICAgICBwdHIgOj0gbWxvYWQoMHg0MCkKICAgICAgICAgICAgICAgIGlmIGlzemVybyhwdHIpIHsgcHRyIDo9IDB4NjAgfQogICAgICAgICAgICAgICAgbXN0b3JlKDB4NDAsIGFkZChwdHIsIHNpemUpKQogICAgICAgICAgICB9CgogICAgICAgICAgICAvLyBydW50aW1lIGNvZGUKCiAgICAgICAgICAgIG1zdG9yZSgwLCAiSGVsbG8sIFdvcmxkISIpCiAgICAgICAgICAgIHJldHVybigwLCAweDIwKQogICAgICAgIH0KICAgIH0KCiAgICAvLyBFbWJlZGRlZCBvYmplY3QuIFVzZSBjYXNlIGlzIHRoYXQgdGhlIG91dHNpZGUgaXMgYSBmYWN0b3J5IGNvbnRyYWN0LAogICAgLy8gYW5kIENvbnRyYWN0MiBpcyB0aGUgY29kZSB0byBiZSBjcmVhdGVkIGJ5IHRoZSBmYWN0b3J5CiAgICBvYmplY3QgIkNvbnRyYWN0MiIgewogICAgICAgIGNvZGUgewogICAgICAgICAgICAvLyBjb2RlIGhlcmUgLi4uCiAgICAgICAgfQoKICAgICAgICBvYmplY3QgIkNvbnRyYWN0Ml9kZXBsb3llZCIgewogICAgICAgICAgICBjb2RlIHsKICAgICAgICAgICAgICAgIC8vIGNvZGUgaGVyZSAuLi4KICAgICAgICAgICAgfQogICAgICAgIH0KCiAgICAgICAgZGF0YSAiVGFibGUxIiBoZXgiNDEyMyIKICAgIH0KfQ&optimize=false&runs=200&evmVersion=null')
@@ -124,7 +154,7 @@ module.exports = {
       })
   },
 
-  'Should select deploy with proxy option from URL params': function (browser: NightwatchBrowser) {
+  'Should select deploy with proxy option from URL params #group1': function (browser: NightwatchBrowser) {
     browser
       .url('http://127.0.0.1:8080/#optimize=false&runs=200&deployProxy=true')
       .refresh()
@@ -142,7 +172,7 @@ module.exports = {
       .expect.element('[data-id="contractGUIDeployWithProxy"]').to.be.selected
   },
 
-  'Should select upgrade with proxy option from URL params': function (browser: NightwatchBrowser) {
+  'Should select upgrade with proxy option from URL params #group1': function (browser: NightwatchBrowser) {
     browser
       .url('http://127.0.0.1:8080/#optimize=false&runs=200&upgradeProxy=true')
       .refresh()
@@ -159,7 +189,7 @@ module.exports = {
       .expect.element('[data-id="contractGUIUpgradeImplementation"]').to.be.selected
   },
 
-  'Should load using various URL compiler params': function (browser: NightwatchBrowser) {
+  'Should load using various URL compiler params #group1': function (browser: NightwatchBrowser) {
     browser
       .pause(5000)
       .url('http://127.0.0.1:8080/#optimize=true&runs=300&autoCompile=true&evmVersion=istanbul&version=soljson-v0.7.4+commit.3f05b770.js&language=Yul')
@@ -185,7 +215,7 @@ module.exports = {
       .assert.containsText('#versionSelector option[data-id="selected"]', '0.8.15+commit.e14f2714')
   },
 
-  'Should load using compiler from link passed in remix URL': function (browser: NightwatchBrowser) {
+  'Should load using compiler from link passed in remix URL #group1': function (browser: NightwatchBrowser) {
     browser
       .url('http://127.0.0.1:8080/#version=https://solidity-blog.s3.eu-central-1.amazonaws.com/data/08preview/soljson.js&optimize=false')
       .refresh()
@@ -194,16 +224,16 @@ module.exports = {
       .pause(5000)
       .click('*[data-id="scConfigExpander"]')
       .assert.containsText('#versionSelector option[data-id="selected"]', 'custom')
-    // default values
+      // default values
       .assert.containsText('#evmVersionSelector option[data-id="selected"]', 'default')
       .verify.elementPresent('#optimize')
-      .assert.elementNotPresent('#optimize:checked')
+      .assert.not.elementPresent('#optimize:checked')
       .verify.elementPresent('#runs:disabled')
       .click('[for="optimize"')
       .verify.attributeEquals('#runs', 'value', '200')
   },
 
-  'Should load json files from link passed in remix URL': function (browser: NightwatchBrowser) {
+  'Should load json files from link passed in remix URL #group1': function (browser: NightwatchBrowser) {
     browser
       .url('http://127.0.0.1:8080/#optimize=false&runs=200&evmVersion=null&version=soljson-v0.6.12+commit.27d51765.js&url=https://raw.githubusercontent.com/EthVM/evm-source-verification/main/contracts/1/0x011e5846975c6463a8c6337eecf3cbf64e328884/input.json')
       .refresh()

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

@@ -13,7 +13,7 @@ module.exports = {
       .click('*[data-id="verticalIconsKindpluginManager"]')
       .scrollAndClick('*[data-id="pluginManagerComponentActivateButtondebugger"]')
       .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtondebugger"]', 7000)
-      .rightClick('[data-id="verticalIconsKinddebugger"]')
+      .rightClickCustom('[data-id="verticalIconsKinddebugger"]')
       .waitForElementVisible('*[id="menuitemdeactivate"]')
       .waitForElementVisible('*[id="menuitemdocumentation"]')
       .click('*[data-id="remixIdeIconPanel"]')
@@ -23,7 +23,7 @@ module.exports = {
     browser.waitForElementVisible('div[data-id="remixIdeIconPanel"]', 10000)
       .waitForElementVisible('*[data-id="verticalIconsKinddebugger"]', 7000)
       .pause(5000)
-      .rightClick('[data-id="verticalIconsKinddebugger"]')
+      .rightClickCustom('[data-id="verticalIconsKinddebugger"]')
       .click('*[id="menuitemdeactivate"]')
       .click('*[data-id="verticalIconsKindsettings"]')
       .click('*[data-id="verticalIconsKindpluginManager"]')

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

@@ -33,7 +33,7 @@ module.exports = {
 
   // WORKSPACE TEMPLATES E2E START
 
-  'Should create Remix default workspace with files': function (browser: NightwatchBrowser) {
+  'Should create Remix default workspace with files #group1': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('filePanel')
       .click('*[data-id="workspaceCreate"]')
@@ -44,53 +44,53 @@ module.exports = {
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
       .pause(1000)
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
       // check js and ts files are not transformed
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
-      
+
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .pause(2000)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, accountIndex?: number): Promise<ethers.Contract> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/storage.test.js"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests/storage.test.js"]')
       .click('*[data-id="treeViewLitreeViewItemtests/storage.test.js"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`const { expect } = require("chai");`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/Ballot_test.sol"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemREADME.txt"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests/Ballot_test.sol"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.txt"]')
   },
 
-  'Should create blank workspace with no files': function (browser: NightwatchBrowser) {
+  'Should create blank workspace with no files #group1': function (browser: NightwatchBrowser) {
     browser
       .click('*[data-id="workspaceCreate"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
@@ -102,16 +102,16 @@ module.exports = {
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
       .pause(100)
-      .assert.elementPresent('*[data-id="treeViewUltreeViewMenu"]')
+      .waitForElementPresent('*[data-id="treeViewUltreeViewMenu"]')
       .execute(function () {
         const fileList = document.querySelector('*[data-id="treeViewUltreeViewMenu"]')
         return fileList.getElementsByTagName('li').length;
-      }, [], function(result){
-          browser.assert.equal(result.value, 0, 'Incorrect number of files');
+      }, [], function (result) {
+        browser.assert.equal(result.value, 0, 'Incorrect number of files');
       });
   },
 
-  'Should create ERC20 workspace with files': function (browser: NightwatchBrowser) {
+  'Should create ERC20 workspace with files #group1': function (browser: NightwatchBrowser) {
     browser
       .click('*[data-id="workspaceCreate"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
@@ -123,43 +123,43 @@ module.exports = {
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
       .pause(100)
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts/SampleERC20.sol"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/SampleERC20.sol"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
       // check js and ts files are not transformed
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
-      
-      .getEditorValue((content) => {
+      .pause(5000)
+      .getEditorValue((content) => {        
         browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
-      .pause(100)
-      .getEditorValue((content) => {
+      .pause(4000)
+      .getEditorValue((content) => {        
         browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
-      .pause(100)
-      .getEditorValue((content) => {
+      .pause(4000)
+      .getEditorValue((content) => {        
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
-      .pause(100)
-      .getEditorValue((content) => {
+      .pause(4000)
+      .getEditorValue((content) => {        
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, accountIndex?: number): Promise<ethers.Contract> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/SampleERC20_test.sol"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests/SampleERC20_test.sol"]')
   },
 
-  'Should create ERC721 workspace with files': function (browser: NightwatchBrowser) {
+  'Should create ERC721 workspace with files #group1': function (browser: NightwatchBrowser) {
     browser
       .click('*[data-id="workspaceCreate"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
@@ -171,72 +171,70 @@ module.exports = {
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
       .pause(100)
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemcontracts/SampleERC721.sol"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/SampleERC721.sol"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
       // check js and ts files are not transformed
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
-      
-      .getEditorValue((content) => {
+      .pause(4000)
+      .getEditorValue((content) => {        
         browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
-      .pause(100)
-      .getEditorValue((content) => {
+      .pause(4000)
+      .getEditorValue((content) => {        
         browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
-      .pause(100)
-      .getEditorValue((content) => {
+      .pause(4000)
+      .getEditorValue((content) => {        
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
-      .pause(100)
-      .getEditorValue((content) => {
+      .pause(4000)
+      .getEditorValue((content) => {        
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, accountIndex?: number): Promise<ethers.Contract> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests"]')
-      .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/SampleERC721_test.sol"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests/SampleERC721_test.sol"]')
   },
 
   // WORKSPACE TEMPLATES E2E END
 
-  'Should create two workspace and switch to the first one': function (browser: NightwatchBrowser) {
+  'Should create two workspace and switch to the first one #group1': function (browser: NightwatchBrowser) {
     browser
-      .click('*[data-id="workspaceCreate"]') // create workspace_name
+      .click('*[data-id="workspaceCreate"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] > button')
-      .click('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .clearValue('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_name')
+      .click('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]')
+      .setValue('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_name')
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
       .pause(1000)
       .addFile('test.sol', { content: 'test' })
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest.sol"]')
-      .click('*[data-id="workspaceCreate"]') // create workspace_name_1
+      .click('*[data-id="workspaceCreate"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] > button')
-      .click('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .clearValue('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_name_1')
+      .click('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]')
+      .setValue('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_name_1')
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-      .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')     
+      .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+      .pause(2000)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
       .pause(2000)
       .waitForElementNotPresent('*[data-id="treeViewLitreeViewItemtest.sol"]')
       .pause(2000)
       .switchWorkspace('workspace_name')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
+      .currentWorkspaceIs('workspace_name')
   },
 
   'Should rename a workspace #group1': function (browser: NightwatchBrowser) {
@@ -251,9 +249,11 @@ module.exports = {
       .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .switchWorkspace('workspace_name_1')
       .pause(2000)
+      .currentWorkspaceIs('workspace_name_1')
       .waitForElementNotPresent('*[data-id="treeViewLitreeViewItemtest.sol"]')
       .switchWorkspace('workspace_name_renamed')
       .pause(2000)
+      .currentWorkspaceIs('workspace_name_renamed')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest.sol"]')
   },
 
@@ -268,84 +268,85 @@ module.exports = {
       .waitForElementNotPresent(`[data-id="dropdown-item-workspace_name_1"]`)
   },
 
-    // CLONE REPOSITORY E2E START
+  // CLONE REPOSITORY E2E START
+
+  'Should clone a repository #group2': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('filePanel')
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .waitForElementPresent('.fa-spinner')
+      .pause(5000)
+      .waitForElementNotPresent('.fa-spinner')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
+      .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix')
+  },
 
-    'Should clone a repository #group2': function (browser: NightwatchBrowser) {
-      browser
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .waitForElementPresent('.fa-spinner')
-        .pause(5000)
-        .waitForElementNotPresent('.fa-spinner')
-        .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
-        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix')
-    },
+  'Should display dgit icon for cloned workspace #group2': function (browser: NightwatchBrowser) {
+    browser
+      .switchWorkspace('default_workspace')
+      .waitForElementNotVisible('[data-id="workspacesSelect"] .fa-code-branch')
+      .switchWorkspace('awesome-remix')
+      .waitForElementVisible('[data-id="workspacesSelect"] .fa-code-branch')
+  },
 
-    'Should display dgit icon for cloned workspace #group2': function (browser: NightwatchBrowser) {
-      browser
-        .switchWorkspace('default_workspace')
-        .waitForElementNotVisible('[data-id="workspacesSelect"] .fa-code-branch')
-        .switchWorkspace('awesome-remix')
-        .waitForElementVisible('[data-id="workspacesSelect"] .fa-code-branch')
-    },
-    
-    'Should display non-clashing names for duplicate clone #group2': '' + function (browser: NightwatchBrowser) {
-      browser
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .pause(5000)
-        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix1')
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .pause(5000)
-        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix2')
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .pause(5000)
-        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix3')
-        .switchWorkspace('awesome-remix')
-        .switchWorkspace('awesome-remix1')
-        .switchWorkspace('awesome-remix2')
-        .switchWorkspace('awesome-remix3')
-    },
+  'Should display non-clashing names for duplicate clone #group2': '' + function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .pause(5000)
+      .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix1')
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .pause(5000)
+      .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix2')
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .pause(5000)
+      .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix3')
+      .switchWorkspace('awesome-remix')
+      .switchWorkspace('awesome-remix1')
+      .switchWorkspace('awesome-remix2')
+      .switchWorkspace('awesome-remix3')
+  },
 
-    'Should display error message in modal for failed clone #group2': function (browser: NightwatchBrowser) {
-      browser
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/non-existent-repo')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .pause(5000)
-        .waitForElementVisible('[data-id="cloneGitRepositoryModalDialogModalBody-react"]')
-        .waitForElementContainsText('[data-id="cloneGitRepositoryModalDialogModalBody-react"]', 'An error occurred: Please check that you have the correct URL for the repo. If the repo is private, you need to add your github credentials (with the valid token permissions) in Settings plugin')
-        .click('[data-id="cloneGitRepository-modal-footer-ok-react"]')
-        .end()
-    },
+  'Should display error message in modal for failed clone #group2': function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/non-existent-repo')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .pause(5000)
+      .waitForElementVisible('[data-id="cloneGitRepositoryModalDialogModalBody-react"]')
+      .waitForElementContainsText('[data-id="cloneGitRepositoryModalDialogModalBody-react"]', 'An error occurred: Please check that you have the correct URL for the repo. If the repo is private, you need to add your github credentials (with the valid token permissions) in Settings plugin')
+      .click('[data-id="cloneGitRepository-modal-footer-ok-react"]')
+      .end()
+  },
 
-    // CLONE REPOSITORY E2E END
+  // CLONE REPOSITORY E2E END
 
   tearDown: sauce
 }

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

@@ -21,14 +21,14 @@ declare module 'nightwatch' {
         modalFooterOKClick(id?: string): NightwatchBrowser,
         clickInstance(index: number): NightwatchBrowser,
         journalLastChildIncludes(val: string): NightwatchBrowser,
-        executeScript(script: string): NightwatchBrowser,
+        executeScriptInTerminal(script: string): NightwatchBrowser,
         clearEditableContent(cssSelector: string): NightwatchBrowser,
         journalChildIncludes(val: string, opts = { shouldHaveOnlyOneOccurence: boolean }): NightwatchBrowser,
         debugTransaction(index: number): NightwatchBrowser,
         checkElementStyle(cssSelector: string, styleProperty: string, expectedResult: string): NightwatchBrowser,
         openFile(name: string): NightwatchBrowser,
         renamePath(path: string, newFileName: string, renamedPath: string): NightwatchBrowser,
-        rightClick(cssSelector: string): NightwatchBrowser,
+        rightClickCustom(cssSelector: string): NightwatchBrowser,
         scrollToLine(line: number): NightwatchBrowser,
         waitForElementContainsText(id: string, value: string, timeout?: number): NightwatchBrowser,
         getModalBody(callback: (value: string, cb: VoidFunction) => void): NightwatchBrowser,

apps/remix-ide/ci/browser_test.sh

@@ -14,8 +14,7 @@ yarn run remixd &
 sleep 5
 
 yarn run build:e2e
-
-TESTFILES=$(grep -IRiL "\'@disabled\': \?true" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test" | sort | circleci tests split )
+TESTFILES=$(grep -IRiL "@disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test" | sort | circleci tests split )
 for TESTFILE in $TESTFILES; do
     npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=$1  || TEST_EXITCODE=1
 done

apps/remix-ide/src/app.js

@@ -410,6 +410,29 @@ class AppComponent {
                 this.appManager.call(...callDetails).catch(console.error)
               }
             }
+
+            if (params.calls) {
+              const calls = params.calls.split("///");
+
+              // call all functions in the list, one after the other
+              for (const call of calls) {
+                const callDetails = call.split("//");
+                if (callDetails.length > 1) {
+                  this.appManager.call(
+                    "notification",
+                    "toast",
+                    `initiating ${callDetails[0]} ...`
+                  );
+
+                  // @todo(remove the timeout when activatePlugin is on 0.3.0)
+                  try {
+                    await this.appManager.call(...callDetails)
+                  } catch (e) {
+                    console.error(e)
+                  }
+                }
+              }
+            }
           })
           .catch(console.error)
       }

libs/remix-core-plugin/src/lib/helpers/fetch-etherscan.ts

@@ -1,24 +1,28 @@
-export const fetchContractFromEtherscan = async (plugin, network, contractAddress, targetPath, key?) => {
+export const fetchContractFromEtherscan = async (plugin, network, contractAddress, targetPath, shouldSetFile = true, key?) => {
   let data
   const compilationTargets = {}
   let etherscanKey
 
   if (!key) etherscanKey = await plugin.call('config', 'getAppParameter', 'etherscan-access-token')
   else etherscanKey = key
-  
+
   if (etherscanKey) {
     const endpoint = network.id == 1 ? 'api.etherscan.io' : 'api-' + network.name + '.etherscan.io'
-    data = await fetch('https://' + endpoint + '/api?module=contract&action=getsourcecode&address='  + contractAddress + '&apikey=' + etherscanKey)
-    data = await data.json()
-    // etherscan api doc https://docs.etherscan.io/api-endpoints/contracts
-    if (data.message === 'OK' && data.status === "1") {
-      if (data.result.length) {
-        if (data.result[0].SourceCode === '') throw new Error(`contract not verified on Etherscan ${network.name} network`)
-        if (data.result[0].SourceCode.startsWith('{')) {
-          data.result[0].SourceCode = JSON.parse(data.result[0].SourceCode.replace(/(?:\r\n|\r|\n)/g, '').replace(/^{{/,'{').replace(/}}$/,'}'))
+    try {
+      data = await fetch('https://' + endpoint + '/api?module=contract&action=getsourcecode&address=' + contractAddress + '&apikey=' + etherscanKey)
+      data = await data.json()
+      // etherscan api doc https://docs.etherscan.io/api-endpoints/contracts
+      if (data.message === 'OK' && data.status === "1") {
+        if (data.result.length) {
+          if (data.result[0].SourceCode === '') throw new Error(`contract not verified on Etherscan ${network.name} network`)
+          if (data.result[0].SourceCode.startsWith('{')) {
+            data.result[0].SourceCode = JSON.parse(data.result[0].SourceCode.replace(/(?:\r\n|\r|\n)/g, '').replace(/^{{/, '{').replace(/}}$/, '}'))
+          }
         }
-      } 
-    } else throw new Error('unable to retrieve contract data ' + data.message)
+      } else throw new Error('unable to retrieve contract data ' + data.message)
+    } catch (e) {
+      throw new Error('unable to retrieve contract data: ' + e.message)
+    }
   } else throw new Error('unable to try fetching the source code from etherscan: etherscan access token not found. please go to the Remix settings page and provide an access token.')
 
   if (!data || !data.result) {
@@ -27,7 +31,7 @@ export const fetchContractFromEtherscan = async (plugin, network, contractAddres
 
   if (typeof data.result[0].SourceCode === 'string') {
     const fileName = `${targetPath}/${data.result[0].ContractName}.sol`
-    await plugin.call('fileManager', 'setFile', fileName , data.result[0].SourceCode)
+    if (shouldSetFile) await plugin.call('fileManager', 'setFile', fileName, data.result[0].SourceCode)
     compilationTargets[fileName] = { content: data.result[0].SourceCode }
   } else if (data.result[0].SourceCode && typeof data.result[0].SourceCode == 'object') {
     const sources = data.result[0].SourceCode.sources
@@ -36,10 +40,10 @@ export const fetchContractFromEtherscan = async (plugin, network, contractAddres
       file = file.replace(/^\//g, '') // remove first slash.
       if (await plugin.call('contentImport', 'isExternalUrl', file)) {
         // nothing to do, the compiler callback will handle those
-      } else {        
+      } else {
         const path = `${targetPath}/${file}`
         const content = (source as any).content
-        await plugin.call('fileManager', 'setFile', path, content)
+        if (shouldSetFile) await plugin.call('fileManager', 'setFile', path, content)
         compilationTargets[path] = { content }
       }
     }
@@ -47,7 +51,7 @@ export const fetchContractFromEtherscan = async (plugin, network, contractAddres
   let runs = 0
   try {
     runs = parseInt(data.result[0].Runs)
-  } catch (e) {}
+  } catch (e) { }
   const settings = {
     version: data.result[0].CompilerVersion.replace(/^v/, ''),
     language: 'Solidity',

libs/remix-ui/settings/src/lib/constants.ts

@@ -6,7 +6,7 @@ export const warnText = 'Be sure the endpoint is opened before enabling it. \nTh
 export const gitAccessTokenTitle = 'GitHub Access Token'
 export const gitAccessTokenText = 'Manage the access token used to publish to Gist and retrieve GitHub contents.'
 export const gitAccessTokenText2 = 'Go to github token page (link below) to create a new token and save it in Remix. Make sure this token has only \'create gist\' permission.'
-export const gitAccessTokenLink = 'https://github.com/settings/tokens'
+export const gitAccessTokenLink = 'https://github.com/settings/tokens/new?scopes=gist,repo&description=Remix%20IDE%20Token'
 export const etherscanTokenTitle = 'EtherScan Access Token'
 export const etherscanTokenLink = 'https://etherscan.io/myapikey'
 export const etherscanAccessTokenText = 'Manage the api key used to interact with Etherscan.'

libs/remix-ui/workspace/src/lib/actions/index.ts

@@ -4,7 +4,7 @@ import Gists from 'gists'
 import { customAction } from '@remixproject/plugin-api/lib/file-system/file-panel/type'
 import { displayNotification, displayPopUp, fetchDirectoryError, fetchDirectoryRequest, fetchDirectorySuccess, focusElement, fsInitializationCompleted, hidePopUp, removeInputFieldSuccess, setCurrentWorkspace, setExpandPath, setMode, setWorkspaces } from './payload'
 import { listenOnPluginEvents, listenOnProviderEvents } from './events'
-import { createWorkspaceTemplate, getWorkspaces, loadWorkspacePreset, setPlugin } from './workspace'
+import { createWorkspaceTemplate, getWorkspaces, loadWorkspacePreset, setPlugin, workspaceExists } from './workspace'
 import { QueryParams } from '@remix-project/remix-lib'
 import { fetchContractFromEtherscan } from '@remix-project/core-plugin' // eslint-disable-line
 import JSZip from 'jszip'
@@ -80,11 +80,13 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
             {id: 5, name: 'goerli'}
           ]
           let found = false
+          const workspaceName = 'etherscan-code-sample'
+          let filePath
           const foundOnNetworks = []
           for (const network of networks) {
             const target = `/${network.name}/${contractAddress}`
             try {
-              data = await fetchContractFromEtherscan(plugin, network, contractAddress, target, etherscanKey)
+              data = await fetchContractFromEtherscan(plugin, network, contractAddress, target, false, etherscanKey)
             } catch (error) {
               if ((error.message.startsWith('contract not verified on Etherscan') || error.message.startsWith('unable to retrieve contract data')) && network.id !== 5)
                 continue
@@ -95,15 +97,15 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
             }
             found = true
             foundOnNetworks.push(network.name)
-            await createWorkspaceTemplate('etherscan-code-sample', 'code-template')
-            plugin.setWorkspace({ name: 'etherscan-code-sample', isLocalhost: false })
-            dispatch(setCurrentWorkspace({ name: 'etherscan-code-sample', isGitRepo: false }))
-            let filePath
+            if (await workspaceExists(workspaceName)) workspaceProvider.setWorkspace(workspaceName)
+            else await createWorkspaceTemplate(workspaceName, 'code-template')
+            plugin.setWorkspace({ name: workspaceName, isLocalhost: false })
+            dispatch(setCurrentWorkspace({ name: workspaceName, isGitRepo: false }))
             count = count + (Object.keys(data.compilationTargets)).length
             for (filePath in data.compilationTargets)
               await workspaceProvider.set(filePath, data.compilationTargets[filePath]['content'])
-            plugin.on('editor', 'editorMounted', async () => await plugin.fileManager.openFile(filePath))
           }
+          plugin.on('editor', 'editorMounted', async () => await plugin.fileManager.openFile(filePath))
           plugin.call('notification', 'toast', `Added ${count} verified contract${count === 1 ? '': 's'} from ${foundOnNetworks.join(',')} network${foundOnNetworks.length === 1 ? '': 's'} of Etherscan for contract address ${contractAddress} !!`)
         } catch (error) {
           await basicWorkspaceInit(workspaces, workspaceProvider)

package.json

@@ -153,7 +153,7 @@
     "@ethereumjs/vm": "^5.5.3",
     "@ethersphere/bee-js": "^3.2.0",
     "@isomorphic-git/lightning-fs": "^4.4.1",
-    "@monaco-editor/react": "^4.3.1",
+    "@monaco-editor/react": "4.4.5",
     "@remixproject/engine": "^0.3.31",
     "@remixproject/engine-web": "^0.3.31",
     "@remixproject/plugin": "^0.3.31",
@@ -161,6 +161,7 @@
     "@remixproject/plugin-utils": "^0.3.31",
     "@remixproject/plugin-webview": "^0.3.31",
     "@remixproject/plugin-ws": "^0.3.31",
+    "@types/nightwatch": "^2.3.1",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "axios": ">=0.26.0",
@@ -245,7 +246,6 @@
     "@types/jest": "^27.0.2",
     "@types/lodash": "^4.14.172",
     "@types/mocha": "^7.0.2",
-    "@types/nightwatch": "1.3.4",
     "@types/node": "~8.9.4",
     "@types/react": "^17.0.24",
     "@types/react-beautiful-dnd": "^13.1.2",
@@ -307,7 +307,7 @@
     "mkdirp": "^0.5.1",
     "mocha": "^8.0.1",
     "nanohtml": "^1.6.3",
-    "nightwatch": "^1.7.11",
+    "nightwatch": "^2.3",
     "nodemon": "^2.0.4",
     "notify-error": "^1.2.0",
     "npm-link-local": "^1.1.0",