From a32053499c15b581b8810b02c1f97bf769e8c1e8 Mon Sep 17 00:00:00 2001 From: Robert Gilliam Date: Mon, 3 Mar 2014 23:17:24 -0800 Subject: [PATCH 1/2] fix failing tests --- Specs/Packages/ATZPackageTests.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Specs/Packages/ATZPackageTests.m b/Specs/Packages/ATZPackageTests.m index 572a2a6..66a1263 100644 --- a/Specs/Packages/ATZPackageTests.m +++ b/Specs/Packages/ATZPackageTests.m @@ -99,7 +99,7 @@ void buildMockInstaller(KWMock *mockInstaller) { __block NSString *progressMessage; __block NSError *completionError; - void (^progressBlock)(NSString *) = ^(NSString *proggressMessage){ progressMessage = @"OH HAI!"; }; + void (^progressBlock)(NSString *, CGFloat) = ^(NSString *proggressMessage, CGFloat progress){ progressMessage = @"OH HAI!"; }; void (^completionBlock)(NSError *) = ^(NSError *failure){ completionError = [NSError errorWithDomain:@"MEH" code:666 userInfo:nil]; }; beforeEach(^{ @@ -116,7 +116,7 @@ void buildMockInstaller(KWMock *mockInstaller) { }); it(@"forwards install to installer", ^{ - [package installWithProgressMessage:progressBlock completion:completionBlock]; + [package installWithProgress:progressBlock completion:completionBlock]; [[progressMessage should] equal:@"OH HAI!"]; [[completionError should] equal:[NSError errorWithDomain:@"MEH" code:666 userInfo:nil]]; }); @@ -127,7 +127,7 @@ void buildMockInstaller(KWMock *mockInstaller) { }); it(@"forwards update to installer", ^{ - [package updateWithProgressMessage:progressBlock completion:completionBlock]; + [package updateWithProgress:progressBlock completion:completionBlock]; [[progressMessage should] equal:@"OH HAI!"]; [[completionError should] equal:[NSError errorWithDomain:@"MEH" code:666 userInfo:nil]]; }); From 9e82aa041f4f87b99a3919f60bdac1e644f4ef80 Mon Sep 17 00:00:00 2001 From: Robert Gilliam Date: Mon, 3 Mar 2014 23:39:15 -0800 Subject: [PATCH 2/2] Make sure Travis build can actually fail. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bc33ff4..051ee1d 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ ci_test: $(XCODEBUILD) test | xcpretty -c; exit ${PIPESTATUS[0]} test: - $(XCODEBUILD) test | tee xcodebuild.log | xcpretty -tc + set -o pipefail && $(XCODEBUILD) test | tee xcodebuild.log | xcpretty -tc # Merge changes into deploy branch update: