Move tests to Xcode9.2

Author: javache

.travis.yml

@@ -1,6 +1,6 @@
 language: objective-c
 
-osx_image: xcode7
+osx_image: xcode7.2
 
 cache:
     directories:

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);
 }

React/Base/RCTBatchedBridge.m

@@ -98,6 +98,8 @@ - (instancetype)initWithParentBridge:(RCTBridge *)bridge
 
 - (void)start
 {
+  NSLog(@"RCTBatchedBridge <%p> setup", self);
+
   dispatch_queue_t bridgeQueue = dispatch_queue_create("com.facebook.react.RCTBridgeQueue", DISPATCH_QUEUE_CONCURRENT);
 
   dispatch_group_t initModulesAndLoadSource = dispatch_group_create();
@@ -141,8 +143,8 @@ - (void)start
 
     // Asynchronously gather the module config
     dispatch_group_async(setupJSExecutorAndModuleConfig, bridgeQueue, ^{
+      NSLog(@"Module config generation");
       if (weakSelf.isValid) {
-
         RCTPerformanceLoggerStart(RCTPLNativeModulePrepareConfig);
         config = [weakSelf moduleConfig];
         RCTPerformanceLoggerEnd(RCTPLNativeModulePrepareConfig);
@@ -151,11 +153,12 @@ - (void)start
         NSInteger total = [[_moduleDataByID valueForKeyPath:@"@sum.hasInstance"] integerValue];
         _asyncInitializedModules = total - _syncInitializedModules;
 #endif
-
       }
     });
 
     dispatch_group_notify(setupJSExecutorAndModuleConfig, bridgeQueue, ^{
+      NSLog(@"Module config injection");
+
       // We're not waiting for this to complete to leave dispatch group, since
       // injectJSONConfiguration and executeSourceCode will schedule operations
       // on the same queue anyway.
@@ -409,9 +412,11 @@ - (void)injectJSONConfiguration:(NSString *)configJSON
                      onComplete:(void (^)(NSError *))onComplete
 {
   if (!self.valid) {
+    NSLog(@"Bridge is not valid, not injecting JSON");
     return;
   }
 
+  NSLog(@"Bridge _is_ valid, injecting JSON to %@", _javaScriptExecutor);
   [_javaScriptExecutor injectJSONText:configJSON
                   asGlobalObjectNamed:@"__fbBatchedBridgeConfig"
                              callback:onComplete];
@@ -561,6 +566,8 @@ - (void)invalidate
     return;
   }
 
+  NSLog(@"RCTBatchedBridge <%p>: invalidate called", self);
+
   RCTAssertMainThread();
 
   _loading = NO;

React/Executors/RCTJSCExecutor.m

@@ -552,6 +552,8 @@ - (void)injectJSONText:(NSString *)script
    asGlobalObjectNamed:(NSString *)objectName
               callback:(RCTJavaScriptCompleteBlock)onComplete
 {
+  NSLog(@"RCTJSCExecutor: injectJSONText");
+
   if (RCT_DEBUG) {
     RCTAssert(RCTJSONParse(script, NULL) != nil, @"%@ wasn't valid JSON!", script);
   }

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

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