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

closes #180
angular · Jan 5, 2017 · 70614a2 · 70614a2
1 parent 6f9a2ab
commit 70614a2
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 29 deletions.
diff --git a/lib/binaries/android_sdk.ts b/lib/binaries/android_sdk.ts
@@ -35,7 +35,6 @@ export class AndroidSDK extends Binary {
  static id = 'android';
  static versionDefault = Config.binaryVersions().android;
  static isDefault = false;
- static shortName = ['android'];
  static DEFAULT_API_LEVELS = '24';
  static DEFAULT_ARCHITECTURES = getAndroidArch();
  static DEFAULT_PLATFORMS = 'google_apis';

diff --git a/lib/binaries/appium.ts b/lib/binaries/appium.ts
@@ -14,7 +14,6 @@ export class Appium extends Binary {
  static id = 'appium';
  static versionDefault = Config.binaryVersions().appium;
  static isDefault = false;
- static shortName = ['appium'];
 
  constructor(alternateCDN?: string) {
  super(alternateCDN || Config.cdnUrls().appium);

diff --git a/lib/binaries/binary.ts b/lib/binaries/binary.ts
@@ -21,9 +21,7 @@ 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
  prefixDefault: string; // start of the file name
  versionCustom: string; // version of file

diff --git a/lib/binaries/chrome_driver.ts b/lib/binaries/chrome_driver.ts
@@ -13,7 +13,6 @@ export class ChromeDriver extends Binary {
  static id = 'chrome';
  static versionDefault = Config.binaryVersions().chrome;
  static isDefault = true;
- static shortName = ['chrome'];
 
  constructor(alternateCDN?: string) {
  super(alternateCDN || Config.cdnUrls().chrome);

diff --git a/lib/binaries/gecko_driver.ts b/lib/binaries/gecko_driver.ts
@@ -20,7 +20,6 @@ export class GeckoDriver extends Binary {
  static id = 'gecko';
  static versionDefault = Config.binaryVersions().gecko;
  static isDefault = true;
- static shortName = ['gecko'];
 
  private static suffixes: SuffixMap = {
  'Darwin': {'x64': '-macos.tar.gz'},

diff --git a/lib/binaries/ie_driver.ts b/lib/binaries/ie_driver.ts
@@ -10,8 +10,8 @@ export class IEDriver extends Binary {
  static os = [OS.Windows_NT];
  static id = 'ie';
  static versionDefault = Config.binaryVersions().ie;
- static isDefault = false;
- static shortName = ['ie', 'ie32'];
+ static isDefault32 = false;
+ static isDefault64 = false;
 
  constructor(alternateCDN?: string) {
  super(alternateCDN || Config.cdnUrls().ie);

diff --git a/lib/binaries/stand_alone.ts b/lib/binaries/stand_alone.ts
@@ -11,7 +11,6 @@ export class StandAlone extends Binary {
  static id = 'standalone';
  static versionDefault = Config.binaryVersions().selenium;
  static isDefault = true;
- static shortName = ['standalone'];
 
  constructor(alternateCDN?: string) {
  super(alternateCDN || Config.cdnUrls().selenium);

diff --git a/lib/cmds/initialize.ts b/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(() => {

diff --git a/lib/cmds/opts.ts b/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(

diff --git a/lib/cmds/start.ts b/lib/cmds/start.ts
@@ -44,10 +44,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;
@@ -155,8 +152,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=' +

diff --git a/lib/cmds/status.ts b/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];

diff --git a/lib/cmds/update.ts b/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);

diff --git a/lib/files/file_manager.ts b/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) :

diff --git a/spec/cmds/status_spec.ts b/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'},