Merge pull request #10 from jamesryanbell/phantomjs2

Added support for PhantomJS 2. Phantom JS is now installed via NPM so no external dependencies are required.

Author: jamesryanbell

lib/wraith.js

@@ -1,14 +1,15 @@
 'use strict';
 
-var fs       = require('fs');
-var async    = require('async');
-var mkdirp   = require('mkdirp');
-var path     = require('path');
-var resemble = require('node-resemble-js');
-var progress = require('progress');
-var gallery  = require('./gallery');
-var helpers  = require('./helpers');
-var log      = require('./logger');
+var fs        = require('fs');
+var async     = require('async');
+var mkdirp    = require('mkdirp');
+var path      = require('path');
+var resemble  = require('node-resemble-js');
+var progress  = require('progress');
+var gallery   = require('./gallery');
+var helpers   = require('./helpers');
+var log       = require('./logger');
+var phantomjs = require('phantomjs2');
 
 function Wraith(config, cb) {
 	var self  = this;
@@ -185,7 +186,7 @@ Wraith.prototype.takeScreenshots = function () {
 				height: 'all'
 			},
 			defaultWhiteBackground: true,
-			phantomPath: task.engine,
+			phantomPath: self.getEnginePath[task.engine],
 			phantomConfig: {
 				'debug':       'false',
 				'load-images': 'true'
@@ -216,6 +217,14 @@ Wraith.prototype.takeScreenshots = function () {
 	});
 };
 
+Wraith.prototype.getEnginePath = function(engine) {
+	if(engine == 'phantomjs') {
+		return phantomjs.path;
+	} else {
+		return engine;
+	}
+};
+
 Wraith.prototype.compareScreenshots = function() {
 	var self        = this;
 	var fileLabels  = [];

package.json

@@ -54,6 +54,7 @@
     "moment": "^2.8.4",
     "mustache": "~0.8.1",
     "node-resemble-js": "0.0.4",
+    "phantomjs2": "^2.2.0",
     "progress": "^1.1.8",
     "rimraf": "~2.2.6",
     "w3counter": "^1.0.3",