Merge branch 'master' into move-appjs-to-appts

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

@@ -5,18 +5,13 @@ const selector = '.udapp_contractNames'
 
 class SelectContract extends EventEmitter {
   command(this: NightwatchBrowser, contractName: string): NightwatchBrowser {
-    this.api.waitForElementVisible(selector).perform((done) => {
-      selectContract(this.api, contractName, () => {
-        done()
-        this.emit('complete')
-      })
-    })
+    this.api
+      .waitForElementVisible(selector)
+      .waitForElementPresent(`${selector} option[value="${contractName}"]`)
+      .click(`${selector} option[value="${contractName}"]`)
+      .perform(() => this.emit('complete'))
     return this
   }
 }
 
-function selectContract (browser: NightwatchBrowser, contractName: string, callback: VoidFunction) {
-  browser.click(`${selector} option[value="${contractName}"]`).perform(() => callback())
-}
-
 module.exports = SelectContract

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

@@ -209,11 +209,7 @@ module.exports = {
       .createContract('')
       .getAddressAtPosition(0, (address) => {
         addressRef = address
-      })
-      .perform((done) => {
         browser.addFile('scripts/test_filtering_event.ts', { content: test_filtering_event.replace('<ADDRESS>', addressRef) })
-        .perform(() => done())
-      })
           .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')')
           .pause(1000)
           .waitForElementContainsText('*[data-id="terminalJournal"]', '1')
@@ -221,6 +217,8 @@ module.exports = {
           .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')') // re-emit the event
           .waitForElementContainsText('*[data-id="terminalJournal"]', '2')
           .waitForElementContainsText('*[data-id="terminalJournal"]', 'false')
+      })
+
   },
 
   'Should display auto-complete menu #group4': function (browser: NightwatchBrowser) {