Merge pull request #131 from rhgills/master

Fix failing tests
alcatraz · Mar 4, 2014 · 324ada0 · 324ada0
2 parents 3d89b60 + 9e82aa0
commit 324ada0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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:

diff --git 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]];
         });