more asserting

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

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

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

@@ -209,18 +209,16 @@ 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')
+          .waitForElementContainsText('*[data-id="terminalJournal"]', 'true')
+          .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')') // re-emit the event
+          .waitForElementContainsText('*[data-id="terminalJournal"]', '2')
+          .waitForElementContainsText('*[data-id="terminalJournal"]', 'false')
       })
-      .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')')
+
-      .pause(1000)
-      .waitForElementContainsText('*[data-id="terminalJournal"]', '1')
-      .waitForElementContainsText('*[data-id="terminalJournal"]', 'true')
-      .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) {