Merge pull request #1165 from jneto/fix-update-widget-api

Fix update widget api -- THANKS!

Author: andrewmclagan

api/actions/__tests__/widget-update-test.js

@@ -1,5 +1,6 @@
 import {expect} from 'chai';
 import update from '../widget/update';
+import * as load from '../widget/load';
 import sinon from 'sinon';
 
 describe('widget update', () => {
@@ -10,11 +11,22 @@ describe('widget update', () => {
   });
 
   describe('randomly successful', () => {
+    const widgets = [{}, {id: 2, color: 'Red'}];
+
     beforeEach(()=> {
       sinon.stub(Math, 'random').returns(0.3);
     });
 
+    afterEach(()=> {
+      if ('restore' in load.default) {
+        load.default.restore();
+      }
+    });
+
     it('does not accept green widgets', () => {
+      sinon.stub(load, 'default').returns(new Promise((resolve) => {
+        resolve(widgets);
+      }));
       return update({session: {}, body: {color: 'Green'}}).
       then(
         ()=> {
@@ -24,12 +36,29 @@ describe('widget update', () => {
         });
     });
 
+    it('fails to load widgets', () => {
+      sinon.stub(load, 'default').returns(new Promise((resolve, reject) => {
+        reject('Widget fail to load.');
+      }));
+      return update({session: {}, body: {color: 'Blue'}}).
+      then(
+        ()=> {
+        },
+        (err)=> {
+          expect(err).to.equal('Widget fail to load.');
+        });
+    });
+
     it('updates a widget', () => {
+      sinon.stub(load, 'default').returns(new Promise((resolve) => {
+        resolve(widgets);
+      }));
       const widget = {id: 2, color: 'Blue'};
       return update({session: {}, body: widget}).
       then(
         (res)=> {
           expect(res).to.deep.equal(widget);
+          expect(widgets[1]).to.deep.equal(widget);
         });
     });
   });

api/actions/widget/update.js

@@ -7,17 +7,22 @@ export default function update(req) {
       if (Math.random() < 0.2) {
         reject('Oh no! Widget save fails 20% of the time. Try again.');
       } else {
-        const widgets = load(req);
-        const widget = req.body;
-        if (widget.color === 'Green') {
-          reject({
-            color: 'We do not accept green widgets' // example server-side validation error
-          });
-        }
-        if (widget.id) {
-          widgets[widget.id - 1] = widget;  // id is 1-based. please don't code like this in production! :-)
-        }
-        resolve(widget);
+        load(req).then(data => {
+          const widgets = data;
+          const widget = req.body;
+          if (widget.color === 'Green') {
+            reject({
+              color: 'We do not accept green widgets' // example server-side validation error
+            });
+          }
+          if (widget.id) {
+            widgets[widget.id - 1] = widget;  // id is 1-based. please don't code like this in production! :-)
+            req.session.widgets = widgets;
+          }
+          resolve(widget);
+        }, err => {
+          reject(err);
+        });
       }
     }, 1500); // simulate async db write
   });