Merge pull request #53 from VisualTesting/feature/services-array

Services is now an array of supported services

Author: elicwhite

server/configuration.js

@@ -6,7 +6,7 @@ var defaults = {
   url: 'http://visualdiff.ngrok.com',
   ip: '0.0.0.0',
   port: 8999,
-  service: undefined,
+  services: [],
   differ: undefined,
   storage: undefined
 };
@@ -20,8 +20,8 @@ Configuration.prototype = {
     merge(this._config, newConfig);
   },
 
-  getService: function() {
-    return this._config.service;
+  getServices: function() {
+    return this._config.services;
   },
 
   getIp: function() {

server/controllers/api.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var Bluebird = require('bluebird');
-// var assert = require('chai').assert;
 var fs = Bluebird.promisifyAll(require('fs-extra'));
 
 var actions = require('../actions');

server/serviceListener.js

@@ -14,18 +14,23 @@ function setBuildStatus(options) {
   assert.isString(options.sha);
   assert.isString(options.status);
 
-  var service = config.getService();
-
-  if (service === undefined) {
+  var services = config.getServices();
+  if (services.length === 0) {
     return Bluebird.resolve();
   }
 
   return storage.getProjectInfo(options.project)
   .then(function(info) {
-    return service.setBuildStatus(info.service, {
-      sha: options.sha,
-      status: options.status
-    });
+    return Bluebird.any(
+      services.map(function(service) {
+        if (service.serviceKey === info.service.name) {
+          return service.setBuildStatus(info.service, {
+            sha: options.sha,
+            status: options.status
+          });
+        }
+      })
+    );
   });
 }
 
@@ -35,18 +40,23 @@ function addComment(options) {
   assert.isString(options.sha);
   assert.isString(options.comment);
 
-  var service = config.getService();
-
-  if (service === undefined) {
+  var services = config.getServices();
+  if (services.length === 0) {
     return Bluebird.resolve();
   }
 
   return storage.getProjectInfo(options.project)
   .then(function(info) {
-    return service.addComment(info.service, {
-      sha: options.sha,
-      comment: options.comment
-    });
+    return Bluebird.any(
+      services.map(function(service) {
+        if (service.serviceKey === info.service.name) {
+          return service.addComment(info.service, {
+            sha: options.sha,
+            comment: options.comment
+          });
+        }
+      })
+    );
   });
 }
 

server/utils/github.js

@@ -5,7 +5,7 @@ var Github = require('./asyncGithub');
 
 function verifyConfig(config) {
   assert.isObject(config);
-  assert.equal(config.name, 'github');
+  assert.equal(config.name, GithubUtils.prototype.serviceKey());
   assert.isObject(config.options);
   assert.isString(config.options.user);
   assert.isString(config.options.repository);
@@ -22,6 +22,8 @@ function GithubUtils(options) {
 }
 
 GithubUtils.prototype = {
+  serviceKey: 'github',
+
   setBuildStatus: function(config, options) {
     verifyConfig(config);
 

test/configuration-test.js

@@ -16,9 +16,9 @@ describe('module/configuration', function() {
   it('should not share state with a second instance', function() {
     var config2 = new Configuration();
     config.set({
-      service: 'foo'
+      port: '2000'
     });
 
-    assert.notEqual(config.getService(), config2.getService());
+    assert.notEqual(config.getPort(), config2.getPort());
   });
 });

test/serviceListener-test.js

@@ -95,6 +95,12 @@ describe('module/serviceListener', function() {
     });
 
     describe('without a service', function() {
+      beforeEach(function() {
+        config.set({
+          services: []
+        });
+      });
+
       it('should resolve', function() {
         return assert.isFulfilled(serviceListener._setBuildStatus({
           project: 'project',
@@ -107,29 +113,56 @@ describe('module/serviceListener', function() {
     describe('with a service', function() {
       beforeEach(function() {
         config.set({
-          service: fakeService
+          services: [fakeService]
         });
       });
 
-      it('should call the service setBuildStatus', function() {
-        storageStub.getProjectInfo = this.sinon.stub().resolves({
-          service: projectConfig
+      describe('that does not match the project config', function() {
+        beforeEach(function() {
+          fakeService.serviceKey = 'foo';
         });
 
-        return serviceListener._setBuildStatus({
-          project: 'project',
-          sha: 'sha',
-          status: 'success'
-        })
-        .then(function() {
-          assert.calledWithExactly(
-            fakeService.setBuildStatus,
-            projectConfig,
-            {
-              sha: 'sha',
-              status: 'success'
-            }
-          );
+        it('should not call service setBuildStatus', function() {
+          storageStub.getProjectInfo = this.sinon.stub().resolves({
+            service: projectConfig
+          });
+
+          return serviceListener._setBuildStatus({
+            project: 'project',
+            sha: 'sha',
+            status: 'success'
+          })
+          .then(function() {
+            assert.notCalled(fakeService.setBuildStatus);
+          });
+        });
+      });
+
+      describe('that matches the project config', function() {
+        beforeEach(function() {
+          fakeService.serviceKey = 'github';
+        });
+
+        it('should call the service setBuildStatus', function() {
+          storageStub.getProjectInfo = this.sinon.stub().resolves({
+            service: projectConfig
+          });
+
+          return serviceListener._setBuildStatus({
+            project: 'project',
+            sha: 'sha',
+            status: 'success'
+          })
+          .then(function() {
+            assert.calledWithExactly(
+              fakeService.setBuildStatus,
+              projectConfig,
+              {
+                sha: 'sha',
+                status: 'success'
+              }
+            );
+          });
         });
       });
     });
@@ -166,6 +199,12 @@ describe('module/serviceListener', function() {
     });
 
     describe('without a service', function() {
+      beforeEach(function() {
+        config.set({
+          services: []
+        });
+      });
+
       it('should resolve', function() {
         return assert.isFulfilled(serviceListener._addComment({
           project: 'project',
@@ -178,29 +217,56 @@ describe('module/serviceListener', function() {
     describe('with a service', function() {
       beforeEach(function() {
         config.set({
-          service: fakeService
+          services: [fakeService]
         });
       });
 
-      it('should call the service addComment', function() {
-        storageStub.getProjectInfo = this.sinon.stub().resolves({
-          service: projectConfig
+      describe('that does not match the project config', function() {
+        beforeEach(function() {
+          fakeService.serviceKey = 'foo';
         });
 
-        return serviceListener._addComment({
-          project: 'project',
-          sha: 'sha',
-          comment: 'comment'
-        })
-        .then(function() {
-          assert.calledWithExactly(
-            fakeService.addComment,
-            projectConfig,
-            {
-              sha: 'sha',
-              comment: 'comment'
-            }
-          );
+        it('should not call addComment', function() {
+          storageStub.getProjectInfo = this.sinon.stub().resolves({
+            service: projectConfig
+          });
+
+          return serviceListener._addComment({
+            project: 'project',
+            sha: 'sha',
+            comment: 'comment'
+          })
+          .then(function() {
+            assert.notCalled(fakeService.addComment);
+          });
+        });
+      });
+
+      describe('that matches the project config', function() {
+        beforeEach(function() {
+          fakeService.serviceKey = 'github';
+        });
+
+        it('should call the service addComment', function() {
+          storageStub.getProjectInfo = this.sinon.stub().resolves({
+            service: projectConfig
+          });
+
+          return serviceListener._addComment({
+            project: 'project',
+            sha: 'sha',
+            comment: 'comment'
+          })
+          .then(function() {
+            assert.calledWithExactly(
+              fakeService.addComment,
+              projectConfig,
+              {
+                sha: 'sha',
+                comment: 'comment'
+              }
+            );
+          });
         });
       });
     });

visualtesting.conf.js

@@ -16,7 +16,7 @@ function Apply(config) {
   config.set({
     port: 9000,
 
-    service: service,
+    services: [service],
 
     differ: Differ,
     storage: storage