Fix for erikdoe#164.

Author: erikdoe

Source/OCMock/OCMIndirectReturnValueProvider.m

@@ -16,6 +16,7 @@
 
 #import "NSMethodSignature+OCMAdditions.h"
 #import "OCMIndirectReturnValueProvider.h"
+#import "NSInvocation+OCMAdditions.h"
 
 
 @implementation OCMIndirectReturnValueProvider
@@ -36,9 +37,15 @@ - (void)dealloc
 
 - (void)handleInvocation:(NSInvocation *)anInvocation
 {
-	[anInvocation setTarget:provider];
+    id originalTarget = [anInvocation target];
+    SEL originalSelector = [anInvocation selector];
+
+    [anInvocation setTarget:provider];
 	[anInvocation setSelector:selector];
 	[anInvocation invoke];
+
+    [anInvocation setTarget:originalTarget];
+    [anInvocation setSelector:originalSelector];
 }
 
 @end

Source/OCMockTests/OCMockObjectPartialMocksTests.m

@@ -397,6 +397,18 @@ - (void)testForwardsToRealObjectWhenSetUpAndCalledOnRealObject
 	[mock verify];
 }
 
+- (void)testReturnValueFromRealObjectShouldBeReturnedEvenWithPrecedingAndCall
+{
+  TestClassThatCallsSelf *object = [[TestClassThatCallsSelf alloc] init];
+  OCMockObject *mock = OCMPartialMock(object);
+  [[[[mock stub] andCall:@selector(firstReturnValueMethod) onObject:self] andForwardToRealObject] method2];
+  XCTAssertEqualObjects([object method2], @"Foo", @"Should have returned value from real object.");
+}
+
+- (NSString *)firstReturnValueMethod
+{
+    return @"Bar";
+}
 
 #pragma mark   Tests for method swizzling with partial mocks