expo-dev-launcher 5.0.0 → 5.0.2

package/ios/Tests/BridgeTestHelpers.swift

@@ -0,0 +1,26 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+import Quick
+import Nimble
+import React
+
+@testable import EXDevLauncher
+
+internal class MockBridgeDelegate: NSObject, RCTBridgeDelegate {
+  var loadSourceCalled = false
+
+  func sourceURL(for bridge: RCTBridge) -> URL? {
+    return URL(string: "http://localhost:8081/index.bundle")
+  }
+
+  func loadSource(for bridge: RCTBridge, onProgress: @escaping RCTSourceLoadProgressBlock, onComplete loadCallback: @escaping RCTSourceLoadBlock) {
+    loadSourceCalled = true
+
+    // Executes callback nil for both error and source looks strange but that's the only way we can bypass the lock
+    loadCallback(nil, nil)
+  }
+}
+
+internal func waitBridgeReady(bridgeDelegate: MockBridgeDelegate) {
+  expect(bridgeDelegate.loadSourceCalled).toEventually(beTrue())
+}

package/ios/Tests/EXDevLauncherControllerTest.swift

@@ -21,9 +21,10 @@ class EXDevLauncherControllerTest: QuickSpec {
 
     it("extraModulesForBridge should return essential modules") {
       let module = EXDevLauncherController.sharedInstance()
-      let bridge = RCTBridge(delegate: nil)
+      let bridgeDelegate = MockBridgeDelegate()
+      let bridge = RCTBridge(delegate: bridgeDelegate)
+      waitBridgeReady(bridgeDelegate: bridgeDelegate)
       let modules = module.extraModules(for: bridge!)
-
       expect(modules.first { $0 is RCTDevMenu }).toNot(beNil())
       expect(modules.first { type(of: $0).moduleName() == "DevLoadingView" }).toNot(beNil())
     }

package/ios/Tests/EXDevLauncherRCTBridgeTest.swift

@@ -14,13 +14,17 @@ class EXDevLauncherRCTBridgeTest: QuickSpec {
 
   override class func spec() {
     it("should be connected with EXDevLauncherRCTCxxBridge") {
-      let bridge = EXDevLauncherRCTBridge(delegate: nil, launchOptions: nil)!
+      let bridgeDelegate = MockBridgeDelegate()
+      let bridge = EXDevLauncherRCTBridge(delegate: bridgeDelegate, launchOptions: nil)!
+      waitBridgeReady(bridgeDelegate: bridgeDelegate)
 
       expect(bridge.bridgeClass()).to(be(EXDevLauncherRCTCxxBridge.self))
     }
 
     it("should be able to filter non essential modules") {
-      let cxxBridge = EXDevLauncherRCTBridge(delegate: nil, launchOptions: nil)!.batched as! EXDevLauncherRCTCxxBridge
+      let bridgeDelegate = MockBridgeDelegate()
+      let cxxBridge = EXDevLauncherRCTBridge(delegate: bridgeDelegate, launchOptions: nil)!.batched as! EXDevLauncherRCTCxxBridge
+      waitBridgeReady(bridgeDelegate: bridgeDelegate)
 
       let filteredModules = cxxBridge.filterModuleList([RCTAllowModule.self, NotAllowModule.self, ExpoBridgeModuleAbc.self])