Added tests to make sure that action names given to grouping methods …

…override any that are set within the grouping itself
bitswift · Apr 13, 2012 · 137c528 · 137c528
1 parent afed3ac
commit 137c528
Showing 1 changed file with 26 additions and 7 deletions.
diff --git a/ProtonTests/PRONSUndoManagerAdditionsTests.m b/ProtonTests/PRONSUndoManagerAdditionsTests.m
@@ -47,9 +47,19 @@ - (void)decrementChangeCountWithUndoManager:(NSUndoManager *)undoManager;
     describe(@"adding grouping using block", ^{
         it(@"should set action name", ^{
             [undoManager addGroupingWithActionName:@"foobar" usingBlock:^{
-                expect(weakManager.undoActionName).toEqual(@"foobar");
                 return YES;
             }];
+
+            expect(undoManager.undoActionName).toEqual(@"foobar");
+        });
+
+        it(@"should override any action name set within the block", ^{
+            [undoManager addGroupingWithActionName:@"foobar" usingBlock:^{
+                undoManager.actionName = @"fuzzbuzz";
+                return YES;
+            }];
+
+            expect(undoManager.undoActionName).toEqual(@"foobar");
         });
 
         it(@"should create nested group", ^{
@@ -455,7 +465,7 @@ - (void)decrementChangeCountWithUndoManager:(NSUndoManager *)undoManager;
             expect(calledUndoWithBlock).toBeTruthy();
         });
 
-        it(@"opens an edit grouping without a name", ^{
+        it(@"opens an edit grouping", ^{
             BOOL success = [undoManager tryEditGrouping];
             expect(success).toBeTruthy();
 
@@ -464,6 +474,17 @@ - (void)decrementChangeCountWithUndoManager:(NSUndoManager *)undoManager;
             [undoManager endEditGrouping];
         });
 
+        it(@"overrides names set within an edit grouping block", ^{
+            NSString *expectedName = @"foobar";
+            BOOL success = [undoManager tryEditGroupingWithActionName:expectedName usingBlock:^{
+                block();
+                undoManager.actionName = @"fuzzbuzz";
+            }];
+
+            expect(success).toBeTruthy();
+            expect(undoManager.undoActionName).toEqual(expectedName);
+        });
+
         describe(@"with an open edit grouping", ^{
             before(^{
                 BOOL success = [undoManager tryEditGrouping];
@@ -496,12 +517,10 @@ - (void)decrementChangeCountWithUndoManager:(NSUndoManager *)undoManager;
 
         describe(@"with a block", ^{
             before(^{
-                BOOL success = [undoManager tryEditGroupingWithActionName:@"foobar" usingBlock:^{
-                    expect(undoManager.undoActionName).toEqual(@"foobar");
-                    block();
-                }];
-
+                BOOL success = [undoManager tryEditGroupingWithActionName:@"foobar" usingBlock:block];
                 expect(success).toBeTruthy();
+
+                expect(undoManager.undoActionName).toEqual(@"foobar");
                 expect(calledBlock).toBeTruthy();
             });