expo-dev-menu 6.0.0 → 6.0.1

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 6.0.1 — 2024-10-22
+
+_This version does not introduce any user-facing changes._
+
 ## 6.0.0 — 2024-10-22
 
 ### 🛠 Breaking changes
@@ -31,6 +35,7 @@
 - Removed `expo_patch_react_imports!` and align more stardard react-native project layout. ([#31700](https://github.com/expo/expo/pull/31700) by [@kudo](https://github.com/kudo))
 - Removed deprecated code for SDK 49. ([#31740](https://github.com/expo/expo/pull/31740) by [@kudo](https://github.com/kudo))
 - Remove unused `semver` dependency. ([#32063](https://github.com/expo/expo/pull/32063) by [@kitten](https://github.com/kitten))
+- Fixed broken unit tests since React Native 0.76 bump. ([#32210](https://github.com/expo/expo/pull/32210) by [@kudo](https://github.com/kudo))
 
 ## 5.0.21 - 2024-08-23
 

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '6.0.0'
+version = '6.0.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -20,7 +20,7 @@ android {
   namespace "expo.modules.devmenu"
   defaultConfig {
     versionCode 10
-    versionName '6.0.0'
+    versionName '6.0.1'
   }
 
   buildTypes {

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 EXDevMenu
+
+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/DevMenuAppInstanceTest.swift

@@ -8,10 +8,6 @@ class DevMenuAppInstanceTest: QuickSpec {
   class MockedBridge: RCTBridge {
     var enqueueJSCallWasCalled = false
 
-    override func invalidate() {
-      // NOOP
-    }
-
     override func enqueueJSCall(_ moduleDotMethod: String!, args: [Any]!) {
       enqueueJSCallWasCalled = true
 
@@ -22,7 +18,9 @@ class DevMenuAppInstanceTest: QuickSpec {
 
   override class func spec() {
     it("checks if `sendCloseEvent` sends correct event") {
-      let mockedBridge = MockedBridge(delegate: nil, launchOptions: nil)!
+      let bridgeDelegate = MockBridgeDelegate()
+      let mockedBridge = MockedBridge(delegate: bridgeDelegate, launchOptions: nil)!
+      waitBridgeReady(bridgeDelegate: bridgeDelegate)
       let appInstance = DevMenuAppInstance(
         manager: DevMenuManager.shared,
         bridge: mockedBridge
@@ -34,7 +32,9 @@ class DevMenuAppInstanceTest: QuickSpec {
     }
 
     it("checks if js bundle was found") {
-      let mockedBridge = MockedBridge(delegate: nil, launchOptions: nil)!
+      let bridgeDelegate = MockBridgeDelegate()
+      let mockedBridge = MockedBridge(delegate: bridgeDelegate, launchOptions: nil)!
+      waitBridgeReady(bridgeDelegate: bridgeDelegate)
       let appInstance = DevMenuAppInstance(
         manager: DevMenuManager.shared,
         bridge: mockedBridge
@@ -46,7 +46,9 @@ class DevMenuAppInstanceTest: QuickSpec {
     }
 
     it("checks if extra modules was exported") {
-      let mockedBridge = MockedBridge(delegate: nil, launchOptions: nil)!
+      let bridgeDelegate = MockBridgeDelegate()
+      let mockedBridge = MockedBridge(delegate: bridgeDelegate, launchOptions: nil)!
+      waitBridgeReady(bridgeDelegate: bridgeDelegate)
       let appInstance = DevMenuAppInstance(
         manager: DevMenuManager.shared,
         bridge: mockedBridge

package/ios/Tests/DevMenuRCTBridgeTest.swift

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Expo/React Native module with the developer menu.",
   "main": "build/DevMenu.js",
   "types": "build/DevMenu.d.ts",
@@ -56,7 +56,7 @@
     "@testing-library/react-native": "^12.5.1",
     "babel-plugin-module-resolver": "^5.0.0",
     "babel-preset-expo": "~12.0.0-preview.0",
-    "expo-dev-client-components": "2.0.0",
+    "expo-dev-client-components": "2.0.1",
     "expo-module-scripts": "^4.0.0",
     "fuse.js": "^6.4.6",
     "graphql": "^15.3.0",
@@ -69,5 +69,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "7c7d2362fff23bec26cd145ed34edd9c403551bd"
+  "gitHead": "f7adac0a6b82ab484a8254a68c3808ba6f2afde5"
 }