wip

blond · May 31, 2016 · a123550 · a123550
1 parent 8cdc610
commit a123550
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 50 deletions.
diff --git a/index.js b/index.js
@@ -15,17 +15,19 @@ const TEAMCITY_BUILD_QUEUE_PATHNAME = 'guestAuth/app/rest/buildQueue';
 module.exports = function(teamcityUrl, options) {
     assert(isUrl(teamcityUrl), 'You should specify url to TeamCity');
 
-    const opts = Object.assing({ teamcityUrl }, options);
-
     return got(url.resolve(teamcityUrl, TEAMCITY_BUILD_QUEUE_PATHNAME))
         .then(response => {
             const builds = parse(response);
 
-            return Promise.all(builds.map(build => loadBuild(build, opts)));
+            return Promise.all(builds.map(build => {
+                const buildUrl = url.resolve(teamcityUrl, build.href);
+
+                return loadBuild(buildUrl);
+            }));
         })
         .then(builds => filter(builds, options))
         .then(builds => ({
             builds: builds,
-            count: builds.length
+            size: builds.length
         }));
 };
diff --git a/lib/load-build.js b/lib/load-build.js
@@ -1,5 +1,3 @@
-const url = require('url');
-
 const got = require('got');
 
 const loadCompatibleAgents = require('./load-compatible-agents');
@@ -9,15 +7,7 @@ function loadBuild(buildUrl) {
     return got(buildUrl).then(parseBuildsResponse);
 }
 
-module.exports = (buildInfo, options) => {
-    const href = buildInfo.href;
-
-    if (!href) {
-        return Promise.resolve(buildInfo);
-    }
-
-    const buildUrl = href && url.resolve(options.teamcityUrl, href);
-
+module.exports = (buildUrl) => {
     return Promise.all([
         loadBuild(buildUrl),
         loadCompatibleAgents(buildUrl).catch(() => ([])) // If build had time to start,

diff --git a/lib/parse-builds-response.js b/lib/parse-builds-response.js
@@ -14,6 +14,4 @@ module.exports = (response) => {
     if (root.name === 'builds') {
         return root.children.map(normalize);
     }
-
-    return {};
 };
diff --git a/test/api.test.js b/test/api.test.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const test = require('ava');
+const proxyquire = require('proxyquire');
+const sinon = require('sinon');
+
+test.beforeEach(t => {
+    t.context.gotStub = sinon.stub().returns(Promise.resolve());
+    t.context.parseStub = sinon.stub().returns([]);
+    t.context.loadStub = sinon.stub().returns(Promise.resolve([]));
+    t.context.filterStub = sinon.stub().returns([]);
+
+    t.context.run = proxyquire('../index', {
+        got: t.context.gotStub,
+        './lib/parse-builds-response': t.context.parseStub,
+        './lib/load-build': t.context.loadStub,
+        './lib/filter-builds': t.context.filterStub
+    });
+});
+
+test('should get info by url', t => {
+    return t.context.run('http://tc.url')
+        .then(() => t.true(t.context.gotStub.calledWith('http://tc.url/guestAuth/app/rest/buildQueue')));
+});
+
+test('should returns builds of queue', t => {
+    const builds = [{ id: '1' }];
+
+    t.context.filterStub.returns(builds);
+
+    return t.context.run('http://tc.url')
+        .then(queue => t.deepEqual(queue.builds, builds));
+});
+
+test('should returns queue size', t => {
+    const builds = [{ id: '1' }];
+
+    t.context.filterStub.returns(builds);
+
+    return t.context.run('http://tc.url')
+        .then(queue => t.is(queue.size, builds.length));
+});
+
+test('should load build info', t => {
+    const builds = [{ href: 'build-url-1' }];
+
+    t.context.parseStub.returns(builds);
+
+    return t.context.run('http://tc.url')
+        .then(() => t.true(t.context.loadStub.calledWith('http://tc.url/build-url-1')));
+});
diff --git a/test/load-build.test.js b/test/load-build.test.js
@@ -5,50 +5,43 @@ const proxyquire = require('proxyquire');
 const sinon = require('sinon');
 
 test.beforeEach(t => {
-    t.context.teamcityUrl = 'http://teamcity.my-domain.com';
-    t.context.build = {
-        name: 'build',
-        attributes: {
-            id: '1',
-            href: '/guestAuth/app/rest/buildQueue/id:1'
-        }
-    };
-
     t.context.gotStub = sinon.stub().returns(Promise.resolve());
-    t.context.parseStub = sinon.stub().returns({ root: { name: 'new-build' } });
+    t.context.parseStub = sinon.stub().returns({});
+    t.context.loadAgentsStub = sinon.stub().returns(Promise.resolve([]));
 
-    t.context.loadBuildInfo = proxyquire('../lib/load-build-info', {
+    t.context.load = proxyquire('../lib/load-build', {
         got: t.context.gotStub,
-        './parse-response': t.context.parseStub
+        './parse-builds-response': t.context.parseStub,
+        './load-compatible-agents': t.context.loadAgentsStub
     });
 });
 
-test('should return source info if no href attribute', t => {
-    const build = {
-        root: {
-            name: 'build',
-            attributes: { id: '1' }
-        }
-    };
+test('should return build info', t => {
+    t.context.parseStub.returns({ id: '1' });
 
-    return t.context.loadBuildInfo(build, t.context.teamcityUrl)
-        .then(info => t.deepEqual(info, build.root));
+    return t.context.load('build_url')
+        .then(info => t.is(info.id, '1'));
 });
 
-test('should load build info', t => {
-    return t.context.loadBuildInfo(t.context.build, t.context.teamcityUrl)
-        .then(() => {
-            const buildUrl = `${t.context.teamcityUrl}/guestAuth/app/rest/buildQueue/id:1`;
-            const agentsUrl = `${t.context.teamcityUrl}/guestAuth/app/rest/buildQueue/id:1/compatibleAgents`;
+test('should add empty field if no compatible agents', t => {
+    t.context.loadAgentsStub.returns(Promise.resolve([]));
+
+    return t.context.load('build_url')
+        .then(info => t.deepEqual(info.compatibleAgents, []));
+});
+
+test('should add empty field with compatible agents', t => {
+    const agents = [{ id: '1' }];
+
+    t.context.loadAgentsStub.returns(Promise.resolve(agents));
 
-            t.true(t.context.gotStub.calledWith(buildUrl));
-            t.true(t.context.gotStub.calledWith(agentsUrl));
-        });
+    return t.context.load('build_url')
+        .then(info => t.deepEqual(info.compatibleAgents, agents));
 });
 
-test('should return build info if no info about compatible agents', t => {
-    t.context.gotStub.onCall(1).returns(Promise.reject());
+test('should not throw if an error occurred while getting compatible agents', t => {
+    t.context.loadAgentsStub.returns(Promise.reject());
 
-    return t.context.loadBuildInfo(t.context.build, t.context.teamcityUrl)
-        .then(info => t.deepEqual(info, { name: 'new-build' }));
+    return t.context.load('build_url')
+        .then(info => t.deepEqual(info.compatibleAgents, []));
 });