Upgrade e2e tests to Webdriver.io v6.

ukeenan · May 5, 2020 · fb7d5bb · fb7d5bb
1 parent 3857404
commit fb7d5bb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/wdio/hooks/index.js b/wdio/hooks/index.js
@@ -5,21 +5,20 @@
 const cmds = require('wdio-screen-commands')
 
 /* eslint-disable jsdoc/valid-types */
-/** @type WebdriverIO.Config */
+/** @type WebdriverIO.HookFunctions */
 const config = {
   before: async () => {
-    global.Should = require('chai').should()
     browser.addCommand('saveScreenshotByName', cmds.saveScreenshotByName)
     browser.addCommand('saveAndDiffScreenshot', cmds.saveAndDiffScreenshot)
     if (browser.config.maximizeWindow) await browser.maximizeWindow()
   },
   beforeTest: async test => {
     await cmds.startScreenRecording(test)
   },
-  afterTest: async test => {
+  afterTest: async (test, context, result) => {
     await Promise.all([
-      cmds.stopScreenRecording(test),
-      cmds.saveScreenshotByTest(test)
+      cmds.stopScreenRecording(test, result),
+      cmds.saveScreenshotByTest(test, result)
     ])
   }
 }

diff --git a/wdio/test/pages/file-upload.js b/wdio/test/pages/file-upload.js
@@ -36,7 +36,7 @@ class FileUpload {
    */
   open(timeout) {
     browser.url('/')
-    this.fileinput.waitForExist(timeout)
+    this.fileinput.waitForExist({ timeout })
     return this
   }
   /**
@@ -48,10 +48,10 @@ class FileUpload {
    */
   upload(files, timeout) {
     this.fileinput.addValue(files.join('\n'))
-    browser.waitUntil(() => !this.processing.length, timeout)
+    browser.waitUntil(() => !this.processing.length, { timeout })
     this.start.click()
-    browser.waitUntil(() => !!this.downloads.length, timeout)
-    browser.waitUntil(() => !this.uploads.length, timeout)
+    browser.waitUntil(() => !!this.downloads.length, { timeout })
+    browser.waitUntil(() => !this.uploads.length, { timeout })
     return this
   }
   /**
@@ -62,12 +62,11 @@ class FileUpload {
    */
   delete(timeout) {
     this.toggle.click()
-    browser.waitUntil(
-      () => this.downloads.length === this.checked.length,
+    browser.waitUntil(() => this.downloads.length === this.checked.length, {
       timeout
-    )
+    })
     this.remove.click()
-    browser.waitUntil(() => !this.downloads.length, timeout)
+    browser.waitUntil(() => !this.downloads.length, { timeout })
     return this
   }
 }