Skip to content

Commit

Permalink
fix : add support for phantomjs installed locally or with PHANTOMJS_BIN
Browse files Browse the repository at this point in the history
  • Loading branch information
Chad Smith committed Apr 3, 2014
1 parent 5c541bf commit 6969167
Showing 1 changed file with 11 additions and 17 deletions.
28 changes: 11 additions & 17 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
var fs = require('fs');
var path = require('path');


function serializeOption(value) {
if (typeof value === 'function') {
return value.toString();
}
return JSON.stringify(value);
}

var win32PhantomJSPath = function () {
// get the path stored in phantomjs\lib\location.js, someting like
// "C:\\Users\\user-name\\AppData\\Roaming\\npm\\phantomjs.CMD"
var cmd = require('phantomjs').path;
var phantomJSExePath = function () {
// If the path we're given by phantomjs is to a .cmd, it is pointing to a global copy.
// Using the cmd as the process to execute causes problems cleaning up the processes
// so we walk from the cmd to the phantomjs.exe and use that instead.

// get the global npm install directory by removing the filename from cmd variable
var npmGlobalRoot = path.dirname(cmd);
 var phantomSource = require('phantomjs').path;

// add known path
var phantom = npmGlobalRoot + '\\node_modules\\phantomjs\\bin\\phantomjs';
 if (path.extname(phantomSource).toLowerCase() === '.cmd') {
   return path.join(path.dirname( phantomSource ), '//node_modules//phantomjs//lib//phantom//phantomjs.exe');
 }

return phantom;
 return phantomSource;
};

var PhantomJSBrowser = function(baseBrowserDecorator, config, args) {
Expand Down Expand Up @@ -48,12 +47,7 @@ var PhantomJSBrowser = function(baseBrowserDecorator, config, args) {
optionsCode.join('\n') + '\npage.open("' + url + '");\n';
fs.writeFileSync(captureFile, captureCode);

var isWin = /^win/.test(process.platform);
if (isWin) {
flags = flags.concat(win32PhantomJSPath(), captureFile);
} else {
flags = flags.concat(captureFile);
}
flags = flags.concat(captureFile);

// and start phantomjs
this._execCommand(this._getCommand(), flags);
Expand All @@ -66,7 +60,7 @@ PhantomJSBrowser.prototype = {
DEFAULT_CMD: {
linux: require('phantomjs').path,
darwin: require('phantomjs').path,
win32: process.execPath //path to node.exe, see flags in _start()
win32: phantomJSExePath()
},
ENV_CMD: 'PHANTOMJS_BIN'
};
Expand Down

0 comments on commit 6969167

Please sign in to comment.