Merge pull request #17 from KATT/master

Prevent adding a state which name is already persistent
blakewatters · Mar 14, 2014 · c8283da · c8283da
2 parents 4bc1377 + b4751e8
commit c8283da
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Code/TKStateMachine.m b/Code/TKStateMachine.m
@@ -110,6 +110,8 @@ - (void)addState:(TKState *)state
 {
     TKRaiseIfActive();
     if (! [state isKindOfClass:[TKState class]]) [NSException raise:NSInvalidArgumentException format:@"Expected a `TKState` object, instead got a `%@` (%@)", [state class], state];
+    if ([self stateNamed: state.name]) [NSException raise:NSInvalidArgumentException format:@"State with name `%@` already exists", state.name];
+
     if (self.initialState == nil) self.initialState = state;
     [self.mutableStates addObject:state];
 }

diff --git a/Specs/TKStateMachineSpec.m b/Specs/TKStateMachineSpec.m
@@ -69,6 +69,17 @@ - (void)startTryingToPickUpCollegeGirls {}
             [stateMachine addState:state];
         });
 
+
+        context(@"which name is already present", ^{
+            it(@"raises an exception", ^{
+                TKState *singleState = [TKState stateWithName:@"Single"];
+
+                [[theBlock(^{
+                    [stateMachine addState:singleState];
+                }) should] raiseWithName:NSInvalidArgumentException reason:@"State with name `Single` already exists"];
+            });
+        });
+
         it(@"has a state count of 1", ^{
             [[stateMachine.states should] haveCountOf:1];
         });
@@ -182,7 +193,6 @@ - (void)startTryingToPickUpCollegeGirls {}
 
     context(@"when the state machine has not been started", ^{
         beforeEach(^{
-            [stateMachine addState:[TKState stateWithName:@"Dating"]];
             stateMachine.initialState = [stateMachine stateNamed:@"Dating"];
         });