From 70f518985a97479a26e5d8bb9dc0afd64b343621 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Mon, 21 Sep 2020 17:42:26 -0700
Subject: [PATCH] Upgrade webdriverio to v6

---
 package-lock.json                             | 17 +++++++++++------
 tests/generators/run_generators_in_browser.js |  7 ++++---
 tests/mocha/run_mocha_tests_in_browser.js     | 12 ++++++++----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fd82f6f55..02719e87f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6889,9 +6889,9 @@
       }
     },
     "readdir-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.0.0.tgz",
-      "integrity": "sha512-km0DIcwQVZ1ZUhXhMWpF74/Wm5aFEd5/jDiVWF1Hkw2myPQovG8vCQ8+FQO2KXE9npQQvCnAMZhhWuUee4WcCQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.0.tgz",
+      "integrity": "sha512-KgT0oXPIDQRRRYFf+06AUaodICTep2Q5635BORLzTEzp7rEqcR14a47j3Vzm3ix7FeI1lp8mYyG7r8lTB06Pyg==",
       "dev": true,
       "requires": {
         "minimatch": "^3.0.4"
@@ -8136,6 +8136,11 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "typescript": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz",
+      "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="
+    },
     "typescript-closure-tools": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/typescript-closure-tools/-/typescript-closure-tools-0.0.7.tgz",
@@ -8548,9 +8553,9 @@
           }
         },
         "got": {
-          "version": "11.6.2",
-          "resolved": "https://registry.npmjs.org/got/-/got-11.6.2.tgz",
-          "integrity": "sha512-/21qgUePCeus29Jk7MEti8cgQUNXFSWfIevNIk4H7u1wmXNDrGPKPY6YsPY+o9CIT/a2DjCjRz0x1nM9FtS2/A==",
+          "version": "11.7.0",
+          "resolved": "https://registry.npmjs.org/got/-/got-11.7.0.tgz",
+          "integrity": "sha512-7en2XwH2MEqOsrK0xaKhbWibBoZqy+f1RSUoIeF1BLcnf+pyQdDsljWMfmOh+QKJwuvDIiKx38GtPh5wFdGGjg==",
           "dev": true,
           "requires": {
             "@sindresorhus/is": "^3.1.1",
diff --git a/tests/generators/run_generators_in_browser.js b/tests/generators/run_generators_in_browser.js
index eb1504082..0a1692a7c 100644
--- a/tests/generators/run_generators_in_browser.js
+++ b/tests/generators/run_generators_in_browser.js
@@ -39,9 +39,10 @@ async function runLangGeneratorInBrowser(browser, filename, codegenFn) {
  */
 async function runGeneratorsInBrowser() {
   var options = {
-      capabilities: {
-          browserName: 'firefox'
-      }
+    capabilities: {
+      browserName: 'firefox'
+    },
+    path: '/wd/hub'
   };
   // Run in headless mode on Travis.
   if (process.env.TRAVIS_CI) {
diff --git a/tests/mocha/run_mocha_tests_in_browser.js b/tests/mocha/run_mocha_tests_in_browser.js
index 88f1b9d4b..509a3570c 100644
--- a/tests/mocha/run_mocha_tests_in_browser.js
+++ b/tests/mocha/run_mocha_tests_in_browser.js
@@ -19,9 +19,10 @@ module.exports = runMochaTestsInBrowser;
  */
 async function runMochaTestsInBrowser() {
   var options = {
-      capabilities: {
-          browserName: 'chrome'
-      }
+    capabilities: {
+      browserName: 'chrome'
+    },
+    path: '/wd/hub'
   };
   // Run in headless mode on Travis.
   if (process.env.TRAVIS_CI) {
@@ -40,7 +41,10 @@ async function runMochaTestsInBrowser() {
     var elem = await browser.$('#failureCount');
     var text = await elem.getAttribute('tests_failed');
     return text != 'unset';
-  }, 33000);
+  }
+  , {
+    timeout: 50000
+  });
 
   const elem = await browser.$('#failureCount');
   const numOfFailure = await elem.getAttribute('tests_failed');