Merge branch 'dmaclach-disallowInvocationActionsOnRejects'

Author: erikdoe

Source/OCMock/OCMInvocationExpectation.m

@@ -37,10 +37,18 @@ - (BOOL)isSatisfied
     return isSatisfied;
 }
 
-- (void)handleInvocation:(NSInvocation *)anInvocation
+- (void)addInvocationAction:(id)anAction
 {
-   [super handleInvocation:anInvocation];
+    if(matchAndReject)
+    {
+        [NSException raise:NSInternalInconsistencyException format:@"%@: cannot add action to a reject stub; got %@",
+                [self description], anAction];
+    }
+    [super addInvocationAction:anAction];
+}
 
+- (void)handleInvocation:(NSInvocation *)anInvocation
+{
     if(matchAndReject)
     {
         isSatisfied = NO;
@@ -49,8 +57,11 @@ - (void)handleInvocation:(NSInvocation *)anInvocation
     }
     else
     {
+        [super handleInvocation:anInvocation];
         isSatisfied = YES;
     }
 }
 
+
+
 @end

Source/OCMockTests/OCMockObjectMacroTests.m

@@ -291,6 +291,11 @@ - (void)testSetsUpReject
     XCTAssertThrows([mock verify], @"Should have complained about rejected method being invoked");
 }
 
+- (void)testThrowsWhenTryingToAddActionToReject
+{
+    id mock = OCMClassMock([TestClassForMacroTesting class]);
+    XCTAssertThrows(OCMReject([mock stringValue]).andReturn(@"Foo"));
+}
 
 - (void)testShouldNotReportErrorWhenMethodWasInvoked
 {

Source/OCMockTests/OCMockObjectTests.m

@@ -1082,6 +1082,12 @@ - (void)testThrowsWhenRejectedMethodIsCalledOnNiceMock
     XCTAssertThrows([mock uppercaseString], @"Should have complained about rejected method being called.");
 }
 
+- (void)testThrowsWhenTryingToAddActionToReject
+{
+	mock = [OCMockObject niceMockForClass:[NSString class]];
+	XCTAssertThrows([[[mock reject] andReturn:@"Foo"] stringValue]);
+}
+
 - (void)testUncalledRejectStubDoesNotCountAsExpectation
 {
     mock = [OCMockObject niceMockForClass:[NSString class]];