fix issue jakesgordon#74 - new transitions() method is broken

qlxiao520 · Jan 21, 2015 · f247a9b · f247a9b
1 parent fdfbcdd
commit f247a9b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/state-machine.js b/state-machine.js
@@ -49,8 +49,8 @@
         var from = (e.from instanceof Array) ? e.from : (e.from ? [e.from] : [StateMachine.WILDCARD]); // allow 'wildcard' transition if 'from' is not specified
         map[e.name] = map[e.name] || {};
         for (var n = 0 ; n < from.length ; n++) {
-          transitions[e.from] = transitions[e.from] || [];
-          transitions[e.from].push(e.name);
+          transitions[from[n]] = transitions[from[n]] || [];
+          transitions[from[n]].push(e.name);
 
           map[e.name][from[n]] = e.to || from[n]; // allow no-op transition if 'to' is not specified
         }

diff --git a/state-machine.min.js b/state-machine.min.js
diff --git a/test/test_basics.js b/test/test_basics.js
@@ -144,6 +144,40 @@ test("transitions", function() {
 
 //-----------------------------------------------------------------------------
 
+test("transitions with multiple from states", function() {
+
+  var fsm = StateMachine.create({
+    events: [
+      { name: 'start', from: 'none',              to: 'green'  },
+      { name: 'warn',  from: ['green', 'red'],    to: 'yellow' },
+      { name: 'panic', from: ['green', 'yellow'], to: 'red'    },
+      { name: 'clear', from: ['red', 'yellow'],   to: 'green'  }
+    ]
+  });
+
+  equal(fsm.current, 'none', 'current state should be none');
+  deepEqual(fsm.transitions(), ['start'], 'current transition(s) should be start');
+
+  fsm.start();
+  equal(fsm.current, 'green', 'current state should be green');
+  deepEqual(fsm.transitions(), ['warn', 'panic'], 'current transition(s) should be warn and panic');
+
+  fsm.warn();
+  equal(fsm.current, 'yellow', 'current state should be yellow');
+  deepEqual(fsm.transitions(), ['panic', 'clear'], 'current transition(s) should be panic and clear');
+
+  fsm.panic();
+  equal(fsm.current, 'red', 'current state should be red');
+  deepEqual(fsm.transitions(), ['warn', 'clear'], 'current transition(s) should be warn and clear');
+
+  fsm.clear();
+  equal(fsm.current, 'green', 'current state should be green');
+  deepEqual(fsm.transitions(), ['warn', 'panic'], 'current transition(s) should be warn and panic');
+
+});
+
+//-----------------------------------------------------------------------------
+
 test("isFinished", function() {
 
   var fsm = StateMachine.create({