improved support for ready in RN apps (event is now sent after RN loa…

…ds and not when detox initializes)

detox/ios/Detox/DetoxManager.m

@@ -13,6 +13,7 @@ @interface DetoxManager()
 @property (nonatomic, retain) WebSocket *websocket;
 @property (nonatomic, retain) TestRunner *testRunner;
 @property (nonatomic, retain) ReactNativeSupport *reactNativeSupport;
+@property (nonatomic, assign) BOOL isReady;
 
 @end
 
@@ -34,6 +35,7 @@ - (instancetype)init
     self = [super init];
     if (self == nil) return nil;
 
+    self.isReady = NO;
     self.websocket = [[WebSocket alloc] init];
     self.websocket.delegate = self;
     self.testRunner = [[TestRunner alloc] init];
@@ -49,6 +51,15 @@ - (void) connectToServer:(NSString*)url withSessionId:(NSString*)sessionId
     [self.websocket connectToServer:url withSessionId:sessionId];
 }
 
+- (void) websocketDidConnect
+{
+    if (![self.reactNativeSupport isReactNativeApp])
+    {
+        self.isReady = YES;
+        [self.websocket sendAction:@"ready" withParams:@{}];
+    }
+}
+
 - (void) websocketDidReceiveAction:(NSString *)type withParams:(NSDictionary *)params
 {
     if ([type isEqualToString:@"invoke"])
@@ -59,7 +70,10 @@ - (void) websocketDidReceiveAction:(NSString *)type withParams:(NSDictionary *)p
 
     if ([type isEqualToString:@"isReady"])
     {
-        [self.websocket sendAction:@"ready" withParams:@{}];
+        if (self.isReady)
+        {
+            [self.websocket sendAction:@"ready" withParams:@{}];
+        }
         return;
     }
 
@@ -72,6 +86,7 @@ - (void) websocketDidReceiveAction:(NSString *)type withParams:(NSDictionary *)p
 
     if ([type isEqualToString:@"reactNativeReload"])
     {
+        self.isReady = NO;
         [self.reactNativeSupport reloadApp];
         return;
     }
@@ -101,7 +116,8 @@ - (void)testRunnerOnError:(NSString *)error
 
 - (void)reactNativeAppDidLoad
 {
-    [self.websocket sendAction:@"reactNativeAppLoaded" withParams:@{}];
+    self.isReady = YES;
+    [self.websocket sendAction:@"ready" withParams:@{}];
 }
 
 @end

detox/ios/Detox/ReactNativeSupport.h

@@ -18,6 +18,7 @@
 
 @property (nonatomic, assign) id<ReactNativeSupportDelegate> delegate;
 
+- (BOOL) isReactNativeApp;
 - (void) reloadApp;
 
 @end

detox/ios/Detox/ReactNativeSupport.m

@@ -52,6 +52,11 @@ - (void)dealloc
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+- (BOOL) isReactNativeApp
+{
+    return (NSClassFromString(@"RCTBridge") != nil);
+}
+
 - (void) reloadApp
 {
     [self removeIdlingResources];

detox/ios/Detox/WebSocket.h

@@ -11,6 +11,7 @@
 
 @protocol WebSocketDelegate <NSObject>
 
+- (void)websocketDidConnect;
 - (void)websocketDidReceiveAction:(NSString*)type withParams:(NSDictionary*)params;
 
 @end

detox/ios/Detox/WebSocket.m

@@ -73,7 +73,7 @@ - (void) receiveAction:(NSString*)json
 - (void)webSocketDidOpen:(SRWebSocket *)webSocket
 {
     [self sendAction:@"login" withParams:@{@"sessionId": self.sessionId, @"role": @"testee"}];
-    [self sendAction:@"ready" withParams:@{}];
+    if (self.delegate) [self.delegate websocketDidConnect];
 }
 
 - (void)webSocket:(SRWebSocket *)webSocket didReceiveMessageWithString:(NSString *)string

detox/src/ios/simulator.js

@@ -21,7 +21,7 @@ function _waitUntilReady(onReady) {
 }
 
 function reloadReactNativeApp(onLoad) {
-  websocket.waitForNextAction('reactNativeAppLoaded', onLoad);
+  websocket.waitForNextAction('ready', onLoad);
   websocket.sendAction('reactNativeReload');
 }