Merge pull request #1005 from 18F/release-1.14

Relase 1.14.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudgov-dashboard",
-  "version": "1.13.4",
+  "version": "1.14.0",
   "engines": {
     "node": "6.x.x",
     "npm": "3.x.x"

static_src/actions/org_actions.js

@@ -35,7 +35,14 @@ const orgActions = {
     });
 
     return cfApi.fetchOrgs()
-      .then(orgs => Promise.all(orgs.map(o => cfApi.fetchOrgSummary(o.guid))))
+      .then(orgs =>
+        Promise.all(
+          orgs.map(
+            org =>
+              cfApi.fetchOrgSummary(org.guid).then(summary => Object.assign({}, org, summary))
+          )
+        )
+      )
       .then(orgActions.receivedOrgs);
   },
 

static_src/test/unit/actions/org_actions.spec.js

@@ -52,13 +52,14 @@ describe('orgActions', () => {
   });
 
   describe('fetchAll()', function () {
-    let viewSpy;
+    let viewSpy, spaces;
 
     beforeEach(function (done) {
+      spaces = [{ guid: 'space-123' }, { guid: 'space-abc' }];
       viewSpy = setupViewSpy(sandbox);
       sandbox.stub(orgActions, 'receivedOrgs').returns(Promise.resolve());
       sandbox.stub(cfApi, 'fetchOrgs').returns(Promise.resolve([{ guid: '1234' }]));
-      sandbox.stub(cfApi, 'fetchOrgSummary').returns(Promise.resolve());
+      sandbox.stub(cfApi, 'fetchOrgSummary').returns(Promise.resolve({ spaces }));
 
       orgActions.fetchAll().then(done, done.fail);
     });
@@ -70,6 +71,16 @@ describe('orgActions', () => {
     it('calls receivedOrgs action', function () {
       expect(orgActions.receivedOrgs).toHaveBeenCalledOnce();
     });
+
+    it('fetches org summary data for each org', function () {
+      expect(cfApi.fetchOrgSummary).toHaveBeenCalledOnce();
+    });
+
+    it('merges summary data with org', function () {
+      const [orgs] = orgActions.receivedOrgs.getCall(0).args;
+      const [org] = orgs;
+      expect(org).toEqual({ guid: '1234', spaces });
+    });
   });
 
   describe('receivedOrg()', function () {