From 3af2181eb5f17f528b50180a6280088b6f41dd58 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Wed, 6 Jan 2016 10:50:08 +0000 Subject: [PATCH] Move tests to Xcode9.2 --- .travis.yml | 2 +- Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m | 2 ++ scripts/e2e-test.sh | 4 ++-- scripts/objc-test.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25221640fccd83..67ac1cc42ecd4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c -osx_image: xcode7 +osx_image: xcode7.2 cache: directories: diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m index d428fb44181962..21c23e92e3caec 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m @@ -45,6 +45,7 @@ - (void)setUp {} - (instancetype)init { + NSLog(@"New TestExecutor created"); if (self = [super init]) { _injectedStuff = [NSMutableDictionary dictionary]; } @@ -92,6 +93,7 @@ - (void)injectJSONText:(NSString *)script asGlobalObjectNamed:(NSString *)objectName callback:(RCTJavaScriptCompleteBlock)onComplete { + NSLog(@"Injecting config with name %@", objectName); _injectedStuff[objectName] = script; onComplete(nil); } diff --git a/scripts/e2e-test.sh b/scripts/e2e-test.sh index e51a40827222d6..731a96edf7b277 100755 --- a/scripts/e2e-test.sh +++ b/scripts/e2e-test.sh @@ -2,6 +2,7 @@ # Abort the mission if any command fails set -e +set -x SCRIPTS=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ROOT=$(dirname $SCRIPTS) @@ -58,9 +59,8 @@ npm unpublish react-native-cli --force npm publish $ROOT npm publish $ROOT/react-native-cli - npm install -g react-native-cli -react-native init EndToEndTest +react-native init EndToEndTest --verbose cd EndToEndTest/ios # Make sure we installed local version of react-native diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh index 7a68e2107e727c..ce41e798d6e883 100755 --- a/scripts/objc-test.sh +++ b/scripts/objc-test.sh @@ -28,5 +28,5 @@ trap cleanup EXIT SERVER_PID=$! xctool \ -project Examples/UIExplorer/UIExplorer.xcodeproj \ - -scheme UIExplorer -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 5,OS=9.0' \ + -scheme UIExplorer -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 5,OS=9.2' \ test