fix issue jakesgordon#106 - forward resolved async value to end of lifecycle

jakesgordon · jakesgordon · commit 9143d575f6bb · 2017-06-10T14:18:58.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 coverage
 .nyc_output
+*.swp
diff --git a/src/jsm.js b/src/jsm.js
@@ -131,9 +131,9 @@ mixin(JSM.prototype, {
     return [ event, result, true ]
   },
 
-  observeEvents: function(events, args, previousEvent) {
+  observeEvents: function(events, args, previousEvent, previousResult) {
     if (events.length === 0) {
-      return this.endTransit(true);
+      return this.endTransit(previousResult === undefined ? true : previousResult);
     }
 
     var event     = events[0][0],
@@ -146,7 +146,7 @@ mixin(JSM.prototype, {
 
     if (observers.length === 0) {
       events.shift();
-      return this.observeEvents(events, args, event);
+      return this.observeEvents(events, args, event, previousResult);
     }
     else {
       var observer = observers.shift(),
@@ -159,7 +159,7 @@ mixin(JSM.prototype, {
         return this.endTransit(false);
       }
       else {
-        return this.observeEvents(events, args, event);
+        return this.observeEvents(events, args, event, result);
       }
     }
   },
diff --git a/test/lifecycle.js b/test/lifecycle.js
@@ -490,7 +490,7 @@ test('lifecycle events can be deferred using a promise', t => {
 
     var logger = new LifecycleLogger(),
         start  = Date.now(),
-        pause  = function(ms) { return new Promise(function(resolve, reject) { setTimeout(resolve, ms); }); },
+        pause  = function(ms) { return new Promise(function(resolve, reject) { setTimeout(function() { resolve('resolved') }, ms); }); },
         fsm    = new StateMachine({
           transitions: [
             { name: 'step', from: 'none', to: 'complete' }
@@ -506,11 +506,11 @@ test('lifecycle events can be deferred using a promise', t => {
             onLeaveNone:        function(lifecycle, a, b) { logger(lifecycle, a, b); return pause(100); },
             onLeaveComplete:    function(lifecycle, a, b) { logger(lifecycle, a, b); return pause(100); },
             onAfterTransition:  function(lifecycle, a, b) { logger(lifecycle, a, b); return pause(100); },
-            onAfterStep:        function(lifecycle, a, b) { logger(lifecycle, a, b); return done();     }
+            onAfterStep:        function(lifecycle, a, b) { logger(lifecycle, a, b); return pause(100); }
           }
         });
 
-    function done() {
+    function done(answer) {
       var duration = Date.now() - start;
       t.is(fsm.state, 'complete')
       t.is(duration > 600, true)
@@ -525,10 +525,12 @@ test('lifecycle events can be deferred using a promise', t => {
         { event: 'onAfterTransition',  transition: 'step', from: 'none', to: 'complete', current: 'complete', args: [ 'additional', 'arguments' ] },
         { event: 'onAfterStep',        transition: 'step', from: 'none', to: 'complete', current: 'complete', args: [ 'additional', 'arguments' ] },
       ])
+      t.is(answer, 'resolved');
       resolveTest()
     }
 
     fsm.step('additional', 'arguments')
+       .then(done);
 
   });
 });
@@ -542,15 +544,12 @@ test('lifecycle events can be cancelled using a promise', t => {
         start  = Date.now(),
         pause  = function(ms) {
           return new Promise(function(resolve, reject) {
-            setTimeout(resolve, ms);
+            setTimeout(function() { resolve('resolved') }, ms);
           });
         },
         cancel = function(ms) {
           return new Promise(function(resolve, reject) {
-            setTimeout(function() {
-              reject();
-              done();
-            }, ms);
+            setTimeout(function() { reject('rejected'); }, ms);
           });
         },
         fsm = new StateMachine({
@@ -572,7 +571,7 @@ test('lifecycle events can be cancelled using a promise', t => {
           }
         });
 
-    function done() {
+    function done(answer) {
       var duration = Date.now() - start;
       t.is(fsm.state, 'none');
       t.is(duration > 300, true);
@@ -583,10 +582,12 @@ test('lifecycle events can be cancelled using a promise', t => {
         { event: 'onLeaveNone',        transition: 'step', from: 'none', to: 'complete', current: 'none', args: [ 'additional', 'arguments' ] },
         { event: 'onTransition',       transition: 'step', from: 'none', to: 'complete', current: 'none', args: [ 'additional', 'arguments' ] }
       ]);
+      t.is(answer, 'rejected');
       resolveTest();
     }
 
     fsm.step('additional', 'arguments')
+       .then(done)
 
   })
 })

Original file line number	Diff line number	Diff line change
`@@ -131,9 +131,9 @@ mixin(JSM.prototype, {`
`131`	`131`	`return [ event, result, true ]`
`132`	`132`	`},`
`133`	`133`
`134`		`- observeEvents: function(events, args, previousEvent) {`
	`134`	`+ observeEvents: function(events, args, previousEvent, previousResult) {`
`135`	`135`	`if (events.length === 0) {`
`136`		`- return this.endTransit(true);`
	`136`	`+ return this.endTransit(previousResult === undefined ? true : previousResult);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`var event = events[0][0],`
`@@ -146,7 +146,7 @@ mixin(JSM.prototype, {`
`146`	`146`
`147`	`147`	`if (observers.length === 0) {`
`148`	`148`	`events.shift();`
`149`		`- return this.observeEvents(events, args, event);`
	`149`	`+ return this.observeEvents(events, args, event, previousResult);`
`150`	`150`	`}`
`151`	`151`	`else {`
`152`	`152`	`var observer = observers.shift(),`
`@@ -159,7 +159,7 @@ mixin(JSM.prototype, {`
`159`	`159`	`return this.endTransit(false);`
`160`	`160`	`}`
`161`	`161`	`else {`
`162`		`- return this.observeEvents(events, args, event);`
	`162`	`+ return this.observeEvents(events, args, event, result);`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`},`