Fix Detox logic

detox/ios/Detox/DetoxManager.m

@@ -11,6 +11,7 @@
 
 @interface DetoxManager()
 
+@property (nonatomic) BOOL isReady;
 @property (nonatomic, retain) WebSocket *websocket;
 @property (nonatomic, retain) TestRunner *testRunner;
 
@@ -61,6 +62,11 @@ - (instancetype)init
 	self.testRunner = [[TestRunner alloc] init];
 	self.testRunner.delegate = self;
 
+	if([ReactNativeSupport isReactNativeApp])
+	{
+		[self _waitForRNLoad];
+	}
+
 	return self;
 }
 
@@ -73,6 +79,7 @@ - (void) websocketDidConnect
 {
 	if (![ReactNativeSupport isReactNativeApp])
 	{
+		_isReady = YES;
 		[self.websocket sendAction:@"ready" withParams:@{}];
 	}
 }
@@ -87,7 +94,10 @@ - (void) websocketDidReceiveAction:(NSString *)type withParams:(NSDictionary *)p
 
 	if ([type isEqualToString:@"isReady"])
 	{
-		[self.websocket sendAction:@"ready" withParams:@{}];
+		if(_isReady)
+		{
+			[self.websocket sendAction:@"ready" withParams:@{}];
+		}
 		return;
 	}
 
@@ -100,21 +110,24 @@ - (void) websocketDidReceiveAction:(NSString *)type withParams:(NSDictionary *)p
 
 	if ([type isEqualToString:@"reactNativeReload"])
 	{
+		_isReady = NO;
 		[ReactNativeSupport reloadApp];
 
-		__block __weak id observer;
-		__weak __typeof(self) weakSelf = self;
+		[self _waitForRNLoad];
 
-		observer = [[NSNotificationCenter defaultCenter] addObserverForName:@"RCTContentDidAppearNotification" object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
-
-			[weakSelf.websocket sendAction:@"ready" withParams:@{}];
-
-			[[NSNotificationCenter defaultCenter] removeObserver:observer];
-		}];
 		return;
 	}
 }
 
+- (void)_waitForRNLoad
+{
+	__weak __typeof(self) weakSelf = self;
+	[ReactNativeSupport waitForReactNativeLoadWithCompletionHandler:^{
+		weakSelf.isReady = YES;
+		[weakSelf.websocket sendAction:@"ready" withParams:@{}];
+	}];
+}
+
 - (void)testRunnerOnInvokeResult:(id)res withInvocationId:(NSString *)invocationId
 {
 	if (res == nil) res = @"(null)";

detox/ios/Detox/ReactNativeSupport.h

@@ -10,8 +10,9 @@
 
 @interface ReactNativeSupport : NSObject
 
-+ (BOOL) isReactNativeApp;
-+ (void) reloadApp;
++ (BOOL)isReactNativeApp;
++ (void)reloadApp;
++ (void)waitForReactNativeLoadWithCompletionHandler:(void(^)(void))handler;
 
 @end
 

detox/ios/Detox/ReactNativeSupport.m

@@ -120,4 +120,19 @@ + (void) reloadApp
 	}
 }
 
++ (void)waitForReactNativeLoadWithCompletionHandler:(void (^)(void))handler
+{
+	__block __weak id observer;
+
+	observer = [[NSNotificationCenter defaultCenter] addObserverForName:@"RCTContentDidAppearNotification" object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+
+		if(handler)
+		{
+			handler();
+		}
+
+		[[NSNotificationCenter defaultCenter] removeObserver:observer];
+	}];
+}
+
 @end