Switch electron-chromedriver from GitHub download to npm install

feicc · Dec 13, 2016 · f25a718 · f25a718
1 parent 85481f4
commit f25a718
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 68 deletions.
diff --git a/docs/build-instructions/windows.md b/docs/build-instructions/windows.md
@@ -5,7 +5,7 @@
 * Node.js 4.4.x or later (the architecture of node available to the build system will determine whether you build 32-bit or 64-bit Atom)
 * Python v2.7.x
   * The python.exe must be available at `%SystemDrive%\Python27\python.exe`. If it is installed elsewhere create a symbolic link to the directory containing the python.exe using: `mklink /d %SystemDrive%\Python27 D:\elsewhere\Python27`
-* 7zip (7z.exe available from the command line) - for unpacking Chromedriver and creating distribution zips
+* 7zip (7z.exe available from the command line) - for creating distribution zip files
 * Visual Studio, either:
   * [Visual C++ Build Tools 2015](http://landinghub.visualstudio.com/visual-cpp-build-tools)
   * [Visual Studio 2013 Update 5](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs) (Express Edition or better)

diff --git a/script/build b/script/build
@@ -30,7 +30,6 @@ const copyAssets = require('./lib/copy-assets')
 const createDebianPackage = require('./lib/create-debian-package')
 const createRpmPackage = require('./lib/create-rpm-package')
 const createWindowsInstaller = require('./lib/create-windows-installer')
-const downloadChromedriver = require('./lib/download-chromedriver')
 const dumpSymbols = require('./lib/dump-symbols')
 const generateAPIDocs = require('./lib/generate-api-docs')
 const generateMetadata = require('./lib/generate-metadata')
@@ -58,7 +57,6 @@ generateModuleCache()
 prebuildLessCache()
 generateMetadata()
 generateAPIDocs()
-downloadChromedriver()
 dumpSymbols()
   .then(packageApplication)
   .then(packagedAppPath => {

diff --git a/script/lib/download-chromedriver.js b/script/lib/download-chromedriver.js
diff --git a/script/package.json b/script/package.json
@@ -8,6 +8,7 @@
     "colors": "1.1.2",
     "csslint": "1.0.2",
     "donna": "1.0.13",
+    "electron-chromedriver": "^1.3.0",
     "electron-packager": "7.3.0",
     "electron-winstaller": "2.5.0",
     "fs-extra": "0.30.0",

diff --git a/spec/integration/helpers/start-atom.coffee b/spec/integration/helpers/start-atom.coffee
@@ -10,7 +10,7 @@ webdriverio = require '../../../script/node_modules/webdriverio'
 
 AtomPath = remote.process.argv[0]
 AtomLauncherPath = path.join(__dirname, "..", "helpers", "atom-launcher.sh")
-ChromedriverPath = path.resolve(__dirname, '..', '..', '..', 'electron', 'chromedriver', 'chromedriver')
+ChromedriverPath = path.resolve(__dirname, '..', '..', '..', 'script', 'node_modules', '.bin', 'chromedriver')
 SocketPath = path.join(os.tmpdir(), "atom-integration-test-#{Date.now()}.sock")
 ChromedriverPort = 9515
 ChromedriverURLBase = "/wd/hub"