Merge pull request #4470 from LLK/develop

Merge develop into release

package.json

@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200923151703",
+    "scratch-gui": "0.1.0-prerelease.20200929205858",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

test/integration/selenium-helpers.js

 const webdriver = require('selenium-webdriver');
 const bindAll = require('lodash.bindall');
 require('chromedriver');
+const chromedriverVersion = require('chromedriver').version;
 
 const headless = process.env.SMOKE_HEADLESS || false;
 const remote = process.env.SMOKE_REMOTE || false;
@@ -62,13 +63,23 @@ class SeleniumHelper {
         return driver;
     }
 
+    getChromeVersionNumber () {
+        const versionFinder = /\d+\.\d+/;
+        const versionArray = versionFinder.exec(chromedriverVersion);
+        if (versionArray === null) {
+            throw new Error('couldn\'t find version of chromedriver');
+        }
+        return versionArray[0];
+    }
+
     getSauceDriver (username, accessKey, name) {
+        const chromeVersion = this.getChromeVersionNumber();
         // Driver configs can be generated with the Sauce Platform Configurator
         // https://wiki.saucelabs.com/display/DOCS/Platform+Configurator
         let driverConfig = {
             browserName: 'chrome',
             platform: 'macOS 10.14',
-            version: '84.0'
+            version: chromeVersion
         };
         var driver = new webdriver.Builder()
             .withCapabilities({