Merge pull request #52 from VisualTesting/feature/storage-config

Moving storage into configuration

Author: elicwhite

server/checkBuild.js

@@ -3,11 +3,11 @@
 var assert = require('chai').assert;
 var Bluebird = require('bluebird');
 var dispatcher = require('./dispatcher');
-var storage = require('./utils/storage');
 var constants = require('./constants');
 var actions = require('./actions');
 
 var config;
+var storage;
 
 /*
 payload.sha string
@@ -327,6 +327,8 @@ function generateMarkdownMessage(buildInfo, diffBrowsers) {
 
 function CheckBuild(newConfig) {
   config = newConfig;
+
+  storage = config.getStorage();
 }
 
 CheckBuild.prototype = {

server/configuration.js

@@ -7,7 +7,8 @@ var defaults = {
   ip: '0.0.0.0',
   port: 8999,
   service: undefined,
-  differ: undefined
+  differ: undefined,
+  storage: undefined
 };
 
 function Configuration() {
@@ -16,7 +17,7 @@ function Configuration() {
 
 Configuration.prototype = {
   set: function(newConfig) {
-    this._config = merge(true, this._config, newConfig);
+    merge(this._config, newConfig);
   },
 
   getService: function() {
@@ -37,6 +38,10 @@ Configuration.prototype = {
 
   getDiffer: function() {
     return this._config.differ;
+  },
+
+  getStorage: function() {
+    return this._config.storage;
   }
 };
 

server/controllers/api.js

@@ -4,10 +4,10 @@ var Bluebird = require('bluebird');
 // var assert = require('chai').assert;
 var fs = Bluebird.promisifyAll(require('fs-extra'));
 
-var storage = require('../utils/storage');
 var actions = require('../actions');
 
 var configuration;
+var storage;
 
 function serveImage(imagePromise, res) {
   imagePromise
@@ -21,9 +21,9 @@ function serveImage(imagePromise, res) {
 }
 
 function Api(config) {
-  // assert.isObject(config);
-
   configuration = config;
+
+  storage = configuration.getStorage();
 }
 
 Api.prototype = {

server/serviceListener.js

@@ -4,8 +4,8 @@ var assert = require('chai').assert;
 var Bluebird = require('bluebird');
 var dispatcher = require('./dispatcher');
 var constants = require('./constants');
-var storage = require('./utils/storage');
 
+var storage;
 var config;
 
 function setBuildStatus(options) {
@@ -52,6 +52,8 @@ function addComment(options) {
 
 function ServiceListener(newConfig) {
   config = newConfig;
+
+  storage = config.getStorage();
 }
 
 ServiceListener.prototype = {

test/api-test.js

@@ -15,10 +15,7 @@ describe('module/api', function() {
   var instance;
 
   beforeEach(function() {
-    storageStub = {
-      '@noCallThru': true,
-      '@global': true
-    };
+    storageStub = {};
 
     actionsStub = {
       '@noCallThru': true,
@@ -38,7 +35,7 @@ describe('module/api', function() {
     checkBuildStub.prototype.register = function() {};
 
     var App = proxyquire('../server/app', {
-      '../utils/storage': storageStub,
+      // '../utils/storage': storageStub,
       '../actions': actionsStub,
       './serviceListener': serviceListenerStub,
       './checkBuild': checkBuildStub
@@ -47,6 +44,10 @@ describe('module/api', function() {
     var app = new App();
     var Configuration = require('../server/configuration');
     var config = new Configuration();
+    config.set({
+      storage: storageStub
+    });
+
     app.useConfiguration(config);
 
     api = request(app._instance);

test/checkBuild-test.js

@@ -17,7 +17,6 @@ describe('module/checkBuild', function() {
 
   beforeEach(function() {
     storageStub = {
-      '@noCallThru': true,
       getBuildInfo: this.sinon.stub().resolves({
         head: 'head',
         base: 'base',
@@ -38,12 +37,15 @@ describe('module/checkBuild', function() {
     };
 
     var CheckBuild = proxyquire('../server/checkBuild', {
-      './utils/storage': storageStub,
       './dispatcher': dispatcherStub,
       './actions': actionsStub
     });
 
     config = new Configuration();
+    config.set({
+      storage: storageStub
+    });
+
     checkBuild = new CheckBuild(config);
   });
 

test/serviceListener-test.js

@@ -23,17 +23,16 @@ describe('module/serviceListener', function() {
       on: this.sinon.spy()
     };
 
-    storageStub = {
-      '@noCallThru': true,
-      '@global': true
-    };
+    storageStub = {};
 
     var ServiceListener = proxyquire('../server/serviceListener', {
-      './dispatcher': dispatcherStub,
-      './utils/storage': storageStub
+      './dispatcher': dispatcherStub
     });
 
     config = new Configuration();
+    config.set({
+      storage: storageStub
+    });
     serviceListener = new ServiceListener(config);
 
     function FakeService() {

visualtesting.conf.js

@@ -2,6 +2,7 @@
 
 var Github = require('./server/utils/github');
 var Differ = require('./server/utils/differ');
+var storage = require('../utils/storage');
 
 var service;
 
@@ -17,7 +18,8 @@ function Apply(config) {
 
     service: service,
 
-    differ: Differ
+    differ: Differ,
+    storage: storage
   });
 }