Merge remote-tracking branch 'origin/EditingAdditionsWarnings'

bitswift · Apr 10, 2012 · f2a7131 · f2a7131
2 parents a5d3c27 + 38a5874
commit f2a7131
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Proton/NSUndoManager+EditingAdditions.h b/Proton/NSUndoManager+EditingAdditions.h
@@ -26,7 +26,7 @@
 /**
  * Invokes <tryEditGroupingWithActionName:> with a `nil` `actionName`.
  */
-- (BOOL)tryEditGrouping;
+- (BOOL)tryEditGrouping __attribute__((warn_unused_result));
 
 /**
  * Attempts to open an edit grouping named `actionName` and immediately
@@ -36,7 +36,7 @@
  * If `actionName` is an empty string, the action name currently associated with the menu
  * command is removed. The receiver's action name remains unchanged if this is `nil`.
  */
-- (BOOL)tryEditGroupingWithActionName:(NSString *)actionName;
+- (BOOL)tryEditGroupingWithActionName:(NSString *)actionName __attribute__((warn_unused_result));
 
 /**
  * Invokes <tryEditGroupingWithActionName:usingBlock:> with a `nil`
@@ -52,7 +52,7 @@
  * @param actionName The name of the action associated with undoing the edit grouping.
  * If `actionName` is an empty string, the action name currently associated with the menu
  * command is removed. The receiver's action name remains unchanged if this is `nil`.
- * 
+ *
  * @param block The block to execute within the edit grouping.
  */
 - (BOOL)tryEditGroupingWithActionName:(NSString *)actionName usingBlock:(void (^)(void))block;

diff --git a/ProtonTests/PRONSUndoManagerAdditionsTests.m b/ProtonTests/PRONSUndoManagerAdditionsTests.m
@@ -457,8 +457,9 @@ - (void)decrementChangeCountWithUndoManager:(NSUndoManager *)undoManager;
 
         it(@"opens an edit grouping with a name", ^{
             NSString *expectedName = @"foobar";
-            [undoManager tryEditGroupingWithActionName:expectedName];
+            BOOL success = [undoManager tryEditGroupingWithActionName:expectedName];
 
+            expect(success).toBeTruthy();
             expect(undoManager.undoActionName).toEqual(expectedName);
 
             block();