Add support for downloading chromedriver v91. (#13)

Author: garg3133

src/commands/android/constants.ts

@@ -29,7 +29,7 @@ export const AVAILABLE_OPTIONS: AvailableOptions = {
 
 export const NIGHTWATCH_AVD = 'nightwatch-android-11';
 export const DEFAULT_FIREFOX_VERSION = '105.1.0';
-export const DEFAULT_CHROME_VERSION = '83.0.4103.106';
+export const DEFAULT_CHROME_VERSIONS = ['83', '91'];
 
 export const ABI = (() => {
   const arch = process.arch;

src/commands/android/downloads.json

@@ -5,8 +5,15 @@
     "windows": "https://dl.google.com/android/repository/commandlinetools-win-8512546_latest.zip"
   },
   "chromedriver": {
-    "mac": "https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_mac64.zip",
-    "linux": "https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_linux64.zip",
-    "windows": "https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_win32.zip"
+    "83": {
+      "mac": "https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_mac64.zip",
+      "linux": "https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_linux64.zip",
+      "windows": "https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_win32.zip"
+    },
+    "91": {
+      "mac": "https://chromedriver.storage.googleapis.com/91.0.4472.101/chromedriver_mac64.zip",
+      "linux": "https://chromedriver.storage.googleapis.com/91.0.4472.101/chromedriver_linux64.zip",
+      "windows": "https://chromedriver.storage.googleapis.com/91.0.4472.101/chromedriver_win32.zip"
+    }
   }
 }

src/commands/android/index.ts

@@ -6,12 +6,13 @@ import os from 'os';
 import path from 'path';
 import untildify from 'untildify';
 import {prompt} from 'inquirer';
+import boxen from 'boxen';
 
 import Logger from '../../logger';
 import {getPlatformName, symbols} from '../../utils';
 import {getAlreadyRunningAvd, killEmulatorWithoutWait, launchAVD} from './adb';
 import {
-  ABI, AVAILABLE_OPTIONS, BINARY_TO_PACKAGE_NAME, DEFAULT_CHROME_VERSION,
+  ABI, AVAILABLE_OPTIONS, BINARY_TO_PACKAGE_NAME, DEFAULT_CHROME_VERSIONS,
   DEFAULT_FIREFOX_VERSION, NIGHTWATCH_AVD, SETUP_CONFIG_QUES
 } from './constants';
 import {AndroidSetupResult, Options, OtherInfo, Platform, SdkBinary, SetupConfigs} from './interfaces';
@@ -736,7 +737,7 @@ export class AndroidSetup {
     const verifyChrome = browsers.includes('chrome');
 
     let firefoxLatestVersion = '';
-    let installedChromeVersion = DEFAULT_CHROME_VERSION;
+    let installedChromeVersion = '';
 
     let installFirefox = false;
     let downloadChromedriver = false;
@@ -921,11 +922,13 @@ export class AndroidSetup {
       }
 
       if (downloadChromedriver) {
-        if (installedChromeVersion === DEFAULT_CHROME_VERSION) {
+        const chromeMajorVersion = installedChromeVersion.split('.')[0];
+        if (DEFAULT_CHROME_VERSIONS.includes(chromeMajorVersion)) {
           Logger.log('Downloading chromedriver to work with the factory version of Chrome browser...');
 
+          const chromedriverDownloadLink = (DOWNLOADS.chromedriver as any)[chromeMajorVersion][this.platform];
           const result = await downloadWithProgressBar(
-            DOWNLOADS.chromedriver[this.platform],
+            chromedriverDownloadLink,
             chromedriverDownloadDir,
             true
           );
@@ -935,7 +938,7 @@ export class AndroidSetup {
             status.setupChrome = true;
           } else {
             Logger.log(`\n${colors.red('Failed!')} You can download the chromedriver yourself from the below link:`);
-            Logger.log(colors.cyan(`  ${DOWNLOADS.chromedriver[this.platform]}`));
+            Logger.log(colors.cyan(`  ${chromedriverDownloadLink}`));
             Logger.log(
               '  (Extract and copy the chromedriver binary and paste it in your Nightwatch project inside \'chromedriver-mobile\' folder.)',
               '\n'
@@ -945,16 +948,17 @@ export class AndroidSetup {
           if (status.setupChrome) {
             Logger.log('You can run your tests now on your Android Emulator\'s Chrome browser.\n');
           }
+        } else if (installedChromeVersion === '') {
+          Logger.log(colors.red(symbols().fail), 'chromedriver could not be downloaded (installed browser version unknown).\n');
         } else {
-          Logger.log(colors.cyan('[CHROMEDRIVER]'));
-          Logger.log('Installed Chrome browser version is different from factory version.\n');
-          Logger.log('You can download the chromedriver for current version from the below link:');
-          Logger.log(colors.cyan('  https://chromedriver.storage.googleapis.com/index.html'));
-          Logger.log(
-            '  (Extract and copy the chromedriver binary and paste it in your Nightwatch project inside \'chromedriver-mobile\' folder.)',
-            '\n'
-          );
-          status.setupChrome = true;  // because we have done what we could do, i.e., setup from our side is complete.
+          Logger.log(boxen(
+            colors.cyan('[CHROMEDRIVER]\n\n') +
+            colors.red('Could not download chromedriver (installed Chrome version is different from the factory versions).\n\n') +
+            'You can download chromedriver for the installed Chrome version from the below link:\n' +
+            colors.cyan('  https://chromedriver.storage.googleapis.com/index.html\n\n') +
+            'After downloading, extract the zip file, copy the extracted chromedriver binary, and put in inside \'chromedriver-mobile\' folder in your Nightwatch project.',
+            {padding: 1}
+          ), '\n');
         }
       }
     }
@@ -995,7 +999,7 @@ export class AndroidSetup {
         }
       } else {
         Logger.log(`${colors.red('Error:')} Some requirements failed to set up.`);
-        Logger.log('Please try running the failed commands by yourself and then re-run this tool.\n');
+        Logger.log('Please look for the errors above and try running any failed commands by yourself and then re-run this tool.\n');
 
         Logger.log('If it still fails, please raise an issue with us at:');
         Logger.log(colors.cyan('  https://github.com/nightwatchjs/mobile-helper-tool/issues'), '\n');

src/commands/android/utils/common.ts

@@ -8,7 +8,7 @@ import path from 'path';
 import which from 'which';
 
 import {symbols} from '../../../utils';
-import {ABI, AVAILABLE_OPTIONS, DEFAULT_CHROME_VERSION, DEFAULT_FIREFOX_VERSION, SDK_BINARY_LOCATIONS} from '../constants';
+import {ABI, AVAILABLE_OPTIONS, DEFAULT_CHROME_VERSIONS, DEFAULT_FIREFOX_VERSION, SDK_BINARY_LOCATIONS} from '../constants';
 import {Platform, SdkBinary} from '../interfaces';
 
 export const getAllAvailableOptions = () => {
@@ -126,7 +126,7 @@ export const getLatestVersion = async (browser: 'firefox' | 'chrome'): Promise<s
       return DEFAULT_FIREFOX_VERSION;
     }
   } else {
-    return DEFAULT_CHROME_VERSION;
+    return DEFAULT_CHROME_VERSIONS[1];
   }
 };
 

tests/unit_tests/commands/android/testUtilsGetLatestVersion.js

@@ -46,6 +46,6 @@ describe('test getAllAvailableOptions', function() {
     const {getLatestVersion} = require('../../../../src/commands/android/utils/common');
     const version = await getLatestVersion('chrome');
 
-    assert.strictEqual(version, '83.0.4103.106');
+    assert.strictEqual(version, '91');
   });
 });