Merge pull request #5 from VisualTesting/smallchange

Smallchange

Author: elicwhite

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 
 before_install:
+  - git fetch origin master:master
   - sudo apt-get update
   - sudo apt-get install imagemagick graphicsmagick libcairo2-dev
 

libs/gitInfo.js

@@ -4,6 +4,14 @@ var exec = require('child_process').exec;
 
 function execute(cmd, cb) {
   exec(cmd, function (err, stdout, stderr) {
+    if(err) {
+      console.error('err', err);
+    }
+
+    if(stderr) {
+      console.error('err', err);
+    }
+
     cb(stdout.split('\n').join(''));
   });
 }
@@ -39,8 +47,8 @@ var GitInfo = {
   },
   getCommonAncestor: function(headSha, baseBranch) {
     return new Bluebird(function(resolve) {
-      var command = "bash -c 'diff -u <(git rev-list --all " + headSha + ") "+
-      "<(git rev-list --first-parent " + baseBranch+")' "+
+      var command = "bash -c 'diff -u <(git rev-list " + headSha + " --all) "+
+      "<(git rev-list " + baseBranch + " --first-parent)' "+
       "| sed -ne 's/^ //p' | head -1";
 
       execute(command, function(data) {

package.json

@@ -21,7 +21,6 @@
     "webdriverio": "^2.4.3"
   },
   "scripts": {
-    "postinstall": "selenium-standalone install",
     "start": "node main.js",
     "test": "grunt serve"
   }

test/index.js

@@ -48,15 +48,19 @@ fs.removeAsync(config.screenshotRoot)
 .then(function(branchSha) {
   branchInfo = branchSha;
 
-  console.log('Currently at', branchInfo.sha);
+  console.log('Currently at', branchInfo.branch, branchInfo.sha);
 
   if (branchInfo.branch !== 'master') {
     return gitInfo.getCommonAncestor(branchInfo.sha, 'master')
     .then(function(ancestor) {
+      console.log('diffing against', ancestor);
       return startBuild({
         head: branchInfo.sha,
         base: ancestor,
         numBrowsers: 1
+      })
+      .then(function(build) {
+        console.log('Build started', build.build);
       });
     });
   }
@@ -75,6 +79,7 @@ fs.removeAsync(config.screenshotRoot)
   console.error(e);
 });
 
+
 return;
 
 function upload(options) {
@@ -95,7 +100,7 @@ function upload(options) {
 
       var r = request.post(args, function(error, response, body) {
         if (error || response.statusCode !== 200) {
-          reject(error || new Error(body));
+          reject(error || body);
           return;
         }
 
@@ -129,7 +134,7 @@ function startBuild(options) {
 
     request(options, function(error, response, body) {
       if (error || response.statusCode !== 200) {
-        reject(error || new Error(body));
+        reject(error || body);
         return;
       }