Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix failing tests #131

Merged
merged 2 commits into from

2 participants

@rhgills

Method and block signatures had changed, but the tests weren't updated.

@rhgills

Second commit also fixes #130.

@rhgills

Is the ci_test: makefile target just old cruft that should be deleted? Doesn't seem to be used currently.

@supermarin
Owner

@rhgills thanks for the PR!

ci_test should really be used on the CI, not sure where that got lost.
The difference is that test outputs rspec-style format for your terminal, whilst ci_test would output building phase as well.

@supermarin supermarin merged commit 324ada0 into supermarin:master
@rhgills

@supermarin My pleasure!

I went ahead and changed the makefile to use ci_test in #135.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 4, 2014
  1. @rhgills

    fix failing tests

    rhgills authored
  2. @rhgills
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 4 deletions.
  1. +1 −1  Makefile
  2. +3 −3 Specs/Packages/ATZPackageTests.m
View
2  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:
View
6 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]];
});
Something went wrong with that request. Please try again.