Merge pull request #17 from groupon/jk-safer-download

fix: More reliable (and correct) download

Author: jkrems

lib/chromedriver/version.js

@@ -63,6 +63,8 @@ module.exports = (callback) ->
       version = FALLBACK_CHROMEDRIVER_VERSION
       console.log "[testium] Unable to determine latest version of selenium chromedriver; using #{version}"
       console.error (error.stack || error)
+    else
+      version = version.trim()
 
     {platform, bitness} = getArchitecture()
     downloadUrl = "https://chromedriver.storage.googleapis.com/#{version}/chromedriver_#{platform}#{bitness}.zip"

lib/selenium/download.js

@@ -42,14 +42,17 @@ module.exports = (binPath, tempPath, url, version, callback) ->
 
   tempFileName = "selenium_#{version}.jar"
   tempFilePath = "#{tempPath}/#{tempFileName}"
-  if fs.existsSync tempFilePath
-    copy tempFilePath, binFilePath, callback
+  validTempFilePath = "#{tempPath}/#{tempFileName}.valid"
+
+  if fs.existsSync validTempFilePath
+    copy validTempFilePath, binFilePath, callback
   else
     downloadFile url, tempPath, tempFileName, (error, hash) ->
       return callback error if error?
 
       validate tempFilePath, hash, (error) ->
         return callback error if error?
 
-        copy tempFilePath, binFilePath, callback
-
+        copy tempFilePath, validTempFilePath, (error) ->
+          return callback error if error?
+          copy tempFilePath, binFilePath, callback

src/chromedriver/version.coffee

@@ -1,4 +1,6 @@
 fs = require 'fs'
+{execFile} = require 'child_process'
+
 assert = require 'assert'
 rmrf = require 'rimraf'
 
@@ -30,7 +32,13 @@ seleniumDownload.update BIN_PATH, (error) ->
     assert fs.existsSync(BIN_PATH + '/chromedriver')
     assert fs.existsSync(BIN_PATH + '/selenium.jar')
 
-    clearFileSystem()
+    console.log 'make sure it did not download an invalid jar'
+    execFile 'java', [
+      # -h means "show usage/help". Selenium has no --version :(
+      '-jar', BIN_PATH + '/selenium.jar', '-h'
+    ], (error, stdout) ->
+      throw error if error?
+      clearFileSystem()
 
 process.on 'uncaughtException', (error) ->
   clearFileSystem()