Pulling the differ module out into something that can be configured

Author: elicwhite

server/checkBuild.js

@@ -4,7 +4,6 @@ var assert = require('chai').assert;
 var Bluebird = require('bluebird');
 var dispatcher = require('./dispatcher');
 var storage = require('./utils/storage');
-var differ = require('./utils/differ');
 var constants = require('./constants');
 var actions = require('./actions');
 
@@ -264,6 +263,8 @@ function diffImage(options) {
     })
   ])
   .spread(function(headImage, baseImage) {
+    var differ = config.getDiffer();
+
     return differ.generateDiff(headImage, baseImage)
     .then(function(data) {
 

server/configuration.js

@@ -6,7 +6,8 @@ var defaults = {
   url: 'http://visualdiff.ngrok.com',
   ip: '0.0.0.0',
   port: 8999,
-  service: undefined
+  service: undefined,
+  differ: undefined
 };
 
 function Configuration() {
@@ -32,8 +33,11 @@ Configuration.prototype = {
 
   getUrl: function() {
     return this._config.host;
-  }
+  },
 
+  getDiffer: function() {
+    return this._config.differ;
+  }
 };
 
 module.exports = Configuration;

test/checkBuild-test.js

@@ -10,7 +10,6 @@ var Configuration = require('../server/configuration');
 describe('module/checkBuild', function() {
   var dispatcherStub;
   var storageStub;
-  var differStub;
   var actionsStub;
 
   var checkBuild;
@@ -27,10 +26,6 @@ describe('module/checkBuild', function() {
       })
     };
 
-    differStub = {
-      '@noCallThru': true
-    };
-
     dispatcherStub = {
       '@noCallThru': true,
       on: this.sinon.spy()
@@ -44,7 +39,6 @@ describe('module/checkBuild', function() {
 
     var CheckBuild = proxyquire('../server/checkBuild', {
       './utils/storage': storageStub,
-      './utils/differ': differStub,
       './dispatcher': dispatcherStub,
       './actions': actionsStub
     });
@@ -614,6 +608,7 @@ describe('module/checkBuild', function() {
   });
 
   describe('#diffImage', function() {
+    var differStub;
     var generateDiffStub;
     var options;
 
@@ -633,7 +628,12 @@ describe('module/checkBuild', function() {
         width: 200
       });
 
-      differStub.generateDiff = generateDiffStub;
+      differStub = {
+        '@noCallThru': true,
+        generateDiff: generateDiffStub
+      };
+
+      config.getDiffer = this.sinon.stub().returns(differStub);
 
       storageStub.getImage = this.sinon.stub();
     });

visualtesting.conf.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var Github = require('./server/utils/github');
+var Differ = require('./server/utils/differ');
 
 var service;
 
@@ -14,7 +15,9 @@ function Apply(config) {
   config.set({
     port: 9000,
 
-    service: service
+    service: service,
+
+    differ: Differ
   });
 }