fix(ie): Use 32-bit version by default for IEDriver

closes angular#180

Author: cnishina

lib/binaries/binary.ts

@@ -21,7 +21,6 @@ export interface BinaryMap<T extends Binary> { [id: string]: T; }
 export class Binary {
   static os: OS[];                // the operating systems, the binary can run on
   static id: string;              // the binaries key identifier
-  static isDefault: boolean;      // to download by default
   static versionDefault: string;  // a static default version variable
   static shortName: string[];     // the names used for a binary download
   name: string;                   // used for logging to console

lib/binaries/ie_driver.ts

@@ -10,7 +10,8 @@ export class IEDriver extends Binary {
   static os = [OS.Windows_NT];
   static id = 'ie';
   static versionDefault = Config.binaryVersions().ie;
-  static isDefault = false;
+  static isDefault32 = false;
+  static isDefault64 = false;
   static shortName = ['ie', 'ie32'];
 
   constructor(alternateCDN?: string) {

lib/cmds/initialize.ts

@@ -245,8 +245,9 @@ export function android(
             'android-sdk: Downloading more additional SDK updates ' +
             '(this may take a while)');
         return downloadAndroidUpdates(
-            sdkPath, ['build-tools-24.0.0'].concat(
-                         getAndroidSDKTargets(apiLevels, architectures, platforms, oldAVDs)),
+            sdkPath,
+            ['build-tools-24.0.0'].concat(
+                getAndroidSDKTargets(apiLevels, architectures, platforms, oldAVDs)),
             true, acceptLicenses, verbose);
       })
       .then(() => {

lib/cmds/opts.ts

@@ -13,6 +13,7 @@ export const STANDALONE = 'standalone';
 export const CHROME = 'chrome';
 export const IE = 'ie';
 export const IE32 = 'ie32';
+export const IE64 = 'ie64';
 export const EDGE = 'edge';
 export const GECKO = 'gecko';
 export const ANDROID = 'android';
@@ -58,8 +59,12 @@ opts[STANDALONE] = new Option(
 opts[CHROME] =
     new Option(CHROME, 'Install or update chromedriver', 'boolean', ChromeDriver.isDefault);
 opts[GECKO] = new Option(GECKO, 'Install or update geckodriver', 'boolean', GeckoDriver.isDefault);
-opts[IE] = new Option(IE, 'Install or update ie driver', 'boolean', IEDriver.isDefault);
-opts[IE32] = new Option(IE32, 'Install or update 32-bit ie driver', 'boolean', IEDriver.isDefault);
+opts[IE] = new Option(IE, 'Install or update 32-bit ie driver', 'boolean', IEDriver.isDefault32);
+opts[IE32] =
+    new Option(IE32, 'Install or update 32-bit ie driver', 'boolean', IEDriver.isDefault32);
+opts[IE64] = new Option(
+    IE64, 'Update: install or update 64-bit IE driver. Start: use installed x64 IE driver.',
+    'boolean', IEDriver.isDefault64);
 opts[EDGE] = new Option(
     EDGE, 'Use installed Microsoft Edge driver', 'string',
     'C:\\Program Files (x86)\\Microsoft Web Driver\\MicrosoftWebDriver.exe');
@@ -105,7 +110,8 @@ opts[STARTED_SIGNIFIER] = new Option(
     'A string to be outputted once the selenium server is up and running.  Useful if you are writing a script which uses webdriver-manager.',
     'string');
 opts[SIGNAL_VIA_IPC] = new Option(
-    SIGNAL_VIA_IPC, 'If you are using --' + STARTED_SIGNIFIER +
+    SIGNAL_VIA_IPC,
+    'If you are using --' + STARTED_SIGNIFIER +
         ', this flag will emit the signal string using process.send(), rather than writing it to stdout',
     'boolean', false);
 opts[DETACH] = new Option(

lib/cmds/start.ts

@@ -43,10 +43,7 @@ if (Config.osType() === 'Darwin') {
 }
 
 if (Config.osType() === 'Windows_NT') {
-  prog.addOption(Opts[Opt.VERSIONS_IE])
-      .addOption(Opts[Opt.IE32])
-      .addOption(Opts[Opt.IE])
-      .addOption(Opts[Opt.EDGE]);
+  prog.addOption(Opts[Opt.VERSIONS_IE]).addOption(Opts[Opt.IE64]).addOption(Opts[Opt.EDGE]);
 }
 
 export var program = prog;
@@ -153,8 +150,9 @@ function start(options: Options) {
         path.resolve(outputDir, binaries[GeckoDriver.id].executableFilename(osType)));
   }
   if (downloadedBinaries[IEDriver.id] != null) {
-    if (options[Opt.IE32].getBoolean()) {
-      binaries[IEDriver.id].arch = 'Win32';
+    binaries[IEDriver.id].arch = 'Win32';  // use Win 32 by default
+    if (options[Opt.IE64].getBoolean()) {
+      binaries[IEDriver.id].arch = Config.osArch();  // use the system architecture
     }
     args.push(
         '-Dwebdriver.ie.driver=' +

lib/cmds/status.ts

@@ -59,8 +59,8 @@ function status(options: Options) {
     updateConfig = {};
   }
 
-
   let downloadedBinaries = FileManager.downloadedBinaries(outputDir);
+
   // Log which binaries have been downloaded.
   for (let bin in downloadedBinaries) {
     let downloaded = downloadedBinaries[bin];

lib/cmds/update.ts

@@ -39,7 +39,7 @@ if (Config.osType() === 'Darwin') {
 }
 
 if (Config.osType() === 'Windows_NT') {
-  prog.addOption(Opts[Opt.IE]).addOption(Opts[Opt.IE32]);
+  prog.addOption(Opts[Opt.IE]).addOption(Opts[Opt.IE32]).addOption(Opts[Opt.IE64]);
 }
 
 prog.addOption(Opts[Opt.VERSIONS_STANDALONE])
@@ -72,13 +72,16 @@ function update(options: Options): Promise<void> {
   let standalone = options[Opt.STANDALONE].getBoolean();
   let chrome = options[Opt.CHROME].getBoolean();
   let gecko = options[Opt.GECKO].getBoolean();
-  let ie: boolean = false;
   let ie32: boolean = false;
+  let ie64: boolean = false;
   if (options[Opt.IE]) {
-    ie = options[Opt.IE].getBoolean();
+    ie32 = ie32 || options[Opt.IE].getBoolean();
   }
   if (options[Opt.IE32]) {
-    ie32 = options[Opt.IE32].getBoolean();
+    ie32 = ie32 || options[Opt.IE32].getBoolean();
+  }
+  if (options[Opt.IE64]) {
+    ie64 = options[Opt.IE64].getBoolean();
   }
   let android: boolean = options[Opt.ANDROID].getBoolean();
   let ios: boolean = false;
@@ -150,7 +153,7 @@ function update(options: Options): Promise<void> {
     updateBrowserFile(binary, outputDir);
     promises.push(updateBinary(binary, outputDir, proxy, ignoreSSL));
   }
-  if (ie) {
+  if (ie64) {
     let binary = binaries[IEDriver.id];
     binary.arch = Config.osArch();  // Win32 or x64
     updateBrowserFile(binary, outputDir);

lib/files/file_manager.ts

@@ -122,7 +122,11 @@ export class FileManager {
         }
         // if the suffix does not match the executable,
         // the binary is something like: .exe and .zip
-        else if (existFile.indexOf(binary.suffix(osType, arch)) === -1) {
+        // TODO(cnishina): fix implementation. Suffix method is dependent on the version number
+        // example: chromedriver < 2.23 has a different suffix than 2.23+ (mac32.zip vs mac64.zip).
+        else if (
+            !existFile.endsWith('.zip') && !existFile.endsWith('.tar.gz') &&
+            existFile.indexOf(binary.suffix(osType, arch)) === -1) {
           editExistFile = editExistFile.replace(binary.executableSuffix(osType), '');
           editExistFile = editExistFile.indexOf('_') === 0 ?
               editExistFile.substring(1, editExistFile.length) :

spec/cmds/status_spec.ts

@@ -18,8 +18,6 @@ describe('status', () => {
   // geckodriver {{config version}} [last] [default]
   // standalone 2.24 [last], {{config version}} [default]
   beforeAll((done) => {
-    Config.osType_ = 'Linux';
-    Config.osArch_ = 'x64';
     argv = {
       '_': ['update'],
       'versions': {'chrome': '2.24', 'standalone': '2.44.0'},