From 76735cb754e2dd0b2a364af717fa45f56114aa47 Mon Sep 17 00:00:00 2001 From: Carson McDonald Date: Wed, 10 Jul 2013 20:08:07 -0400 Subject: [PATCH 1/3] Use new httpbin image request to fix image test. --- Tests/AFImageRequestOperationTests.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/AFImageRequestOperationTests.m b/Tests/AFImageRequestOperationTests.m index a8e03ed..a757c75 100644 --- a/Tests/AFImageRequestOperationTests.m +++ b/Tests/AFImageRequestOperationTests.m @@ -105,7 +105,9 @@ } - (void)testThatImageResponseIsNotNilWhenRequestSucceeds { - NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"/response-headers?Content-Type=image/png" relativeToURL:self.baseURL]]; + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"/image" relativeToURL:self.baseURL]]; + [request setValue:@"image/png" forHTTPHeaderField:@"Accept"]; + AFImageRequestOperation *operation = [[AFImageRequestOperation alloc] initWithRequest:request]; [operation start]; From ab3c2ef73fad15f0709aee72dc3c8c500a0b0876 Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Thu, 11 Jul 2013 17:10:58 -0400 Subject: [PATCH 2/3] Restore execution of tests under Travis --- .travis.yml | 1 + Rakefile | 8 ++------ Tests/Podfile.lock | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0038954..f1c137b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,6 @@ language: objective-c before_install: - brew update - brew install xctool --HEAD + - gem install cocoapods -v 0.22.2 - cd Tests && pod install && cd $TRAVIS_BUILD_DIR script: rake test diff --git a/Rakefile b/Rakefile index 9b8d7ef..d929896 100644 --- a/Rakefile +++ b/Rakefile @@ -5,16 +5,12 @@ namespace :test do desc "Run the AFNetworking Tests for iOS" task :ios => :prepare do - $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' build -sdk iphonesimulator -configuration Release") - $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' build-tests -sdk iphonesimulator -configuration Release") - $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' test -test-sdk iphonesimulator -configuration Release") + $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' -sdk iphonesimulator -configuration Release build build-tests run-tests -test-sdk iphonesimulator") end desc "Run the AFNetworking Tests for Mac OS X" task :osx => :prepare do - $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' build -sdk macosx -configuration Release") - $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' build-tests -sdk macosx -configuration Release") - $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' test -test-sdk macosx -sdk macosx -configuration Release") + $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' -sdk macosx -configuration Release build build-tests run-tests -test-sdk macosx") end end diff --git a/Tests/Podfile.lock b/Tests/Podfile.lock index 9dd558a..6e9fc9d 100644 --- a/Tests/Podfile.lock +++ b/Tests/Podfile.lock @@ -17,8 +17,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AFHTTPRequestOperationLogger: 34ba125cb9eeb77a3b67aaaca105720ba3a0798c - AFNetworking: 8f204b1ffb21a4ef0f36c83f1e4f052561626bea + AFNetworking: 9ec8aafb9269236a7630bd8d9838ce2ba30fa2a0 Expecta: d46fb1bd78c90a83da0158b9b1e108de106e369f OCMock: 79212e5e328378af5cfd6edb5feacfd6c49cd8a3 -COCOAPODS: 0.20.2 +COCOAPODS: 0.22.2 From 7fa3f45bf2ebdbe561266ee30bd1eb25c7589221 Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Sun, 14 Jul 2013 13:40:20 -0400 Subject: [PATCH 3/3] Switch Travis build script to leverage xctool 0.1.7, which supports implicit dependencies. Simplify xctool invocation --- .travis.yml | 2 +- Rakefile | 4 ++-- Tests/Schemes/OS X Tests.xcscheme | 2 +- Tests/Schemes/iOS Tests.xcscheme | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1c137b..d0250d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: objective-c before_install: - brew update - - brew install xctool --HEAD + - brew uninstall xctool && brew install https://raw.github.com/fpotter/homebrew/246a1439dab49542d4531ad7e1bac7048151f601/Library/Formula/xctool.rb - gem install cocoapods -v 0.22.2 - cd Tests && pod install && cd $TRAVIS_BUILD_DIR script: rake test diff --git a/Rakefile b/Rakefile index d929896..f0489d2 100644 --- a/Rakefile +++ b/Rakefile @@ -5,12 +5,12 @@ namespace :test do desc "Run the AFNetworking Tests for iOS" task :ios => :prepare do - $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' -sdk iphonesimulator -configuration Release build build-tests run-tests -test-sdk iphonesimulator") + $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' -sdk iphonesimulator -configuration Release test -test-sdk iphonesimulator") end desc "Run the AFNetworking Tests for Mac OS X" task :osx => :prepare do - $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' -sdk macosx -configuration Release build build-tests run-tests -test-sdk macosx") + $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' -sdk macosx -configuration Release test -test-sdk macosx") end end diff --git a/Tests/Schemes/OS X Tests.xcscheme b/Tests/Schemes/OS X Tests.xcscheme index dcb2079..57a00f4 100644 --- a/Tests/Schemes/OS X Tests.xcscheme +++ b/Tests/Schemes/OS X Tests.xcscheme @@ -4,7 +4,7 @@ version = "1.3"> + buildImplicitDependencies = "YES"> + buildImplicitDependencies = "YES">