Fix build

.cspell.json

@@ -1,6 +1,7 @@
 {
   "language": "en",
   "words": [
+    "goog",
     "thomasnordquist",
     "nowrap",
     "subheader",

Readme.md

@@ -20,6 +20,7 @@ Pull-Requests and error reports are welcome.
 ## Run from sources
 
 ```bash
+npm install -g yarn
 yarn
 yarn build
 yarn start
@@ -29,6 +30,7 @@ yarn start
 
 Launch Application
 ```bash
+npm install -g yarn
 yarn
 yarn dev
 ```

app/src/actions/ConnectionManager.ts

@@ -65,13 +65,10 @@ async function openCertificate(): Promise<CertificateParameters> {
     certificateSizeDoesNotMatch: 'Certificate size larger/smaller then expected.',
   }
 
-  const openDialogReturnValue = await remote.dialog.showOpenDialog(
+  const openDialogReturnValue = await remote.dialog.showOpenDialog(remote.getCurrentWindow(), {
-    remote.getCurrentWindow(),
-    {
     properties: ['openFile'],
     securityScopedBookmarks: true,
-    }
+  })
-  )
 
   const selectedFile = openDialogReturnValue.filePaths && openDialogReturnValue.filePaths[0]
   if (!selectedFile) {

package.json

@@ -81,14 +81,14 @@
     "cspell": "^4.0.28",
     "electron": "^7",
     "electron-builder": "^22.1",
-    "mocha": "^6.2.2",
+    "mocha": "7.0.0",
     "mustache": "^3.0.1",
     "npm-run-all": "^4.1.5",
     "nyc": "^14.1.1",
     "prettier": "1.18.2",
     "redux-thunk": "^2.3.0",
     "source-map-support": "^0.5.9",
-    "spectron": "^6.0.0",
+    "spectron": "9",
     "ts-node": "^8.2.0",
     "tslint": "^5.18.0",
     "tslint-config-airbnb": "^5.11.1",
@@ -96,7 +96,7 @@
     "tslint-react-recommended": "^1.0.15",
     "tslint-strict-null-checks": "^1.0.1",
     "typescript": "^3.2.2",
-    "webdriverio": "5.5"
+    "webdriverio": "5.18"
   },
   "dependencies": {
     "about-window": "^1.12.1",

src/spec/demoVideo.ts

@@ -25,13 +25,12 @@ process.on('unhandledRejection', (error: Error | any) => {
 
 const runningUiTestOnCi = os.platform() === 'darwin' ? [] : ['--runningUiTestOnCi']
 
-console.log(`${__dirname}/../../../node_modules/.bin/electron`)
 const options = {
   host: '127.0.0.1', // Use localhost as chrome driver server
   port: 9515, // "9515" is the port opened by chrome driver.
   capabilities: {
-    browserName: 'electron',
+    browserName: 'chrome',
-    chromeOptions: {
+    'goog:chromeOptions': {
       binary: `${__dirname}/../../../node_modules/.bin/electron`,
       args: [
         `--app=${__dirname}/../../..`,
@@ -40,9 +39,9 @@ const options = {
         '--disable-dev-shm-usage',
         '--disable-extensions',
       ].concat(runningUiTestOnCi),
-    },
       windowTypes: ['app', 'webview'],
     },
+  },
 }
 
 async function doStuff() {
@@ -55,6 +54,7 @@ async function doStuff() {
 
   // Wait for Username input to be visible
   await browser.$('//label[contains(text(), "Username")]/..//input')
+
   const scenes = new SceneBuilder()
   await scenes.record('connect', async () => {
     await connectTo('127.0.0.1', browser)

src/spec/leakTest.ts

@@ -1,4 +1,5 @@
 import * as os from 'os'
+import * as webdriverio from 'webdriverio'
 import mockMqtt, { stopUpdates as stopMqttUpdates } from './mock-mqtt'
 import { ClassNameMapping, countInstancesOf, createFakeMousePointer, getHeapDump, setFast, sleep } from './util'
 import { clearSearch, searchTree } from './scenarios/searchTree'
@@ -12,13 +13,12 @@ process.on('unhandledRejection', (error: Error | any) => {
 
 const runningUiTestOnCi = os.platform() === 'darwin' ? [] : ['--runningUiTestOnCi']
 
-console.log(`${__dirname}/../../../node_modules/.bin/electron`)
 const options = {
   host: '127.0.0.1', // Use localhost as chrome driver server
   port: 9515, // "9515" is the port opened by chrome driver.
   capabilities: {
-    browserName: 'electron',
+    browserName: 'chrome',
-    chromeOptions: {
+    'goog:chromeOptions': {
       binary: `${__dirname}/../../../node_modules/.bin/electron`,
       args: [
         `--app=${__dirname}/../../..`,
@@ -27,9 +27,9 @@ const options = {
         '--disable-dev-shm-usage',
         '--disable-extensions',
       ].concat(runningUiTestOnCi),
-    },
       windowTypes: ['app', 'webview'],
     },
+  },
 }
 
 async function doStuff() {
@@ -37,7 +37,7 @@ async function doStuff() {
   await mockMqtt()
   console.log('start webdriver')
 
-  const browser = await WebdriverIO.remote(options)
+  const browser = await webdriverio.remote(options)
   setFast()
   await createFakeMousePointer(browser)
 

src/spec/mock-mqtt.ts

@@ -103,6 +103,7 @@ function generateData(client: mqtt.MqttClient) {
   intervals.push(
     setInterval(() => client.publish('kitchen/temperature', temperature(), { retain: true, qos: 0 }), 1500)
   )
+
   intervals.push(
     setInterval(() => client.publish('kitchen/humidity', temperature(60, -5, 0), { retain: true, qos: 0 }), 1800)
   )

src/spec/scenarios/publishTopic.ts

@@ -35,9 +35,5 @@ export async function publishTopic(browser: Browser) {
 }
 
 async function writeTextPayload(payloadInput: any, text: string) {
-  const chars = text.split('')
+  await payloadInput.setValue(text)
-  for (const char of chars) {
-    await payloadInput.setValue(char)
-    await sleep(10)
-  }
 }

src/spec/scenarios/showMenu.ts

@@ -1,5 +1,5 @@
-import { Browser, Element } from 'webdriverio'
+import { Browser } from 'webdriverio'
-import { clickOn, expandTopic, moveToCenterOfElement, showText, sleep, writeText } from '../util'
+import { clickOn, showText, sleep } from '../util'
 
 export async function showMenu(browser: Browser) {
   const menuButton = await browser.$('//button[contains(@aria-label, "Menu")]')
@@ -11,7 +11,7 @@ export async function showMenu(browser: Browser) {
 
   await browser.saveScreenshot('screen4.png')
 
-  const topicOrder = await browser.$('#select-node-order')
+  const topicOrder = await browser.$('//input[@name="node-order"]/../div')
   await clickOn(topicOrder, browser)
   await sleep(1000)
 

src/spec/util/index.ts

@@ -40,8 +40,10 @@ export async function deleteTextWithBackspaces(element: Element, browser: Browse
 export async function setTextInInput(name: string, text: string, browser: Browser) {
   const input = await browser.$(`//label[contains(text(), "${name}")]/..//input`)
   await clickOn(input, browser, 1)
-  await input.clearValue()
+  await browser.$(`//label[contains(text(), "${name}")]/..//input`)
-  await browser.keys(text)
+
+  await deleteTextWithBackspaces(input, browser)
+  await input.setValue(text)
 }
 
 export async function moveToCenterOfElement(element: Element, browser: Browser) {