Ensuring matchesState returns false when parent is more specific than…

… child. Fixes #69
statelyai · Apr 23, 2018 · 3cd7bd6 · 3cd7bd6
1 parent 5bcee08
commit 3cd7bd6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/graph.ts b/src/graph.ts
@@ -1,5 +1,5 @@
 import { StateNode } from './index';
-import { toStateValue } from './utils';
+import { toStateValue, getActionType } from './utils';
 import {
   StateValue,
   Machine,
@@ -37,7 +37,7 @@ function getEventEdges(node: StateNode, event: string): Edge[] {
       source: node,
       target: node.parent!.getState(transition.target)!,
       event,
-      actions: transition.actions || [],
+      actions: transition.actions ? transition.actions.map(getActionType) : [],
       cond: transition.cond
     };
   });

diff --git a/src/matchesState.ts b/src/matchesState.ts
@@ -15,7 +15,8 @@ export function matchesState(
       return childStateValue === parentStateValue;
     }
 
-    return childStateValue in parentStateValue;
+    // Parent more specific than child
+    return false;
   }
 
   if (typeof parentStateValue === 'string') {

diff --git a/test/matchesState.test.ts b/test/matchesState.test.ts
@@ -60,12 +60,11 @@ describe('matchesState()', () => {
     assert.ok(!matchesState('a.a1', 'b.b1'));
   });
 
-  xit(
-    'should return false if parent state is more specific than child state',
-    () => {
-      assert.ok(!matchesState('a.b.c', 'a.b'));
-    }
-  );
+  it('should return false if parent state is more specific than child state', () => {
+    assert.ok(!matchesState('a.b.c', 'a.b'));
+
+    assert.ok(!matchesState({ a: { b: { c: 'd' } } }, { a: 'b' }));
+  });
 
   it('should return false if two state values are not equivalent', () => {
     assert.ok(!matchesState({ a: 'a1' }, { b: 'b1' }));