fix(test): fix RNTester iOS unit and integration tests

.github/actions/test-ios-rntester/action.yml

@@ -7,9 +7,9 @@ inputs:
   ruby-version:
     description: The version of ruby that must be used
     default: 2.6.10
-  run-unit-tests:
-    description: whether unit tests should run or not.
-    default: "false"
+  run-unit-integration-tests:
+    description: whether unit & integration tests should run or not.
+    default: "true"
   hermes-tarball-artifacts-dir:
     description: The directory where the hermes tarball artifacts are stored
     default: /tmp/hermes/hermes-runtime-darwin
@@ -46,7 +46,7 @@ runs:
       with:
         ruby-version: ${{ inputs.ruby-version }}
     - name: Prepare IOS Tests
-      if: ${{ inputs.run-unit-tests == 'true' }}
+      if: ${{ inputs.run-unit-integration-tests == 'true' }}
       uses: ./.github/actions/prepare-ios-tests
     - name: Set HERMES_ENGINE_TARBALL_PATH envvar if Hermes tarball is present
       shell: bash
@@ -134,33 +134,33 @@ runs:
           echo "App found at $APP_PATH"
           echo "app-path=$APP_PATH" >> $GITHUB_ENV
     - name: "Run Tests: iOS Unit and Integration Tests"
-      if: ${{ inputs.run-unit-tests == 'true' }}
+      if: ${{ inputs.run-unit-integration-tests == 'true' }}
       shell: bash
       run: yarn test-ios
 
     - name: Zip Derived data folder
-      if: ${{ inputs.run-unit-tests == 'true' }}
+      if: ${{ inputs.run-unit-integration-tests == 'true' }}
       shell: bash
       run: |
         echo "zipping tests results"
-        cd /Users/distiller/Library/Developer/Xcode
+        cd /Users/runner/Library/Developer/Xcode
         XCRESULT_PATH=$(find . -name '*.xcresult')
         tar -zcvf xcresults.tar.gz $XCRESULT_PATH
     - name: Upload artifact
       uses: actions/[email protected]
-      if: ${{ inputs.run-unit-tests == 'true' }}
+      if: ${{ inputs.run-unit-integration-tests == 'true' }}
       with:
-        name: xcresults
-        path: /Users/distiller/Library/Developer/Xcode/xcresults.tar.gz
+        name: xcresults-${{ inputs.flavor }}-${{ inputs.use-frameworks }}-Ruby${{ inputs.ruby-version }}
+        path: /Users/runner/Library/Developer/Xcode/xcresults.tar.gz
     - name: Upload RNTester App
       if: ${{ inputs.use-frameworks == 'StaticLibraries' && inputs.ruby-version == '2.6.10' }} # This is needed to avoid conflicts with the artifacts
       uses: actions/[email protected]
       with:
         name: RNTesterApp-NewArch-${{ inputs.flavor }}
         path: ${{ env.app-path }}
     - name: Store test results
-      if: ${{ inputs.run-unit-tests == 'true' }}
+      if: ${{ inputs.run-unit-integration-tests == 'true' }}
       uses: actions/[email protected]
       with:
-        name: test-results
+        name: test-results-${{ inputs.flavor }}-${{ inputs.use-frameworks }}-Ruby${{ inputs.ruby-version }}
         path: ./reports/junit

packages/react-native/React/Base/RCTBridge.mm

@@ -380,10 +380,10 @@ - (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate
                   moduleProvider:(RCTBridgeModuleListProvider)block
                    launchOptions:(NSDictionary *)launchOptions
 {
-  // Only enabld this assertion in OSS
-#if COCOAPODS
-  [RCTBridge throwIfOnLegacyArch];
-#endif
+  // Only enable this assertion in OSS
+//#if COCOAPODS
+//  [RCTBridge throwIfOnLegacyArch];
+//#endif
 
   if (self = [super init]) {
     _delegate = delegate;

packages/react-native/React/Base/RCTUtils.mm

@@ -706,7 +706,7 @@ BOOL RCTForceTouchAvailable(void)
                                                [data base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0]]];
 }
 
-BOOL RCTIsGzippedData(NSData *__nullable /*data*/); // exposed for unit testing purposes
+extern "C" BOOL RCTIsGzippedData(NSData *__nullable /*data*/); // exposed for unit testing purposes
 BOOL RCTIsGzippedData(NSData *__nullable data)
 {
   UInt8 *bytes = (UInt8 *)data.bytes;

packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

@@ -33,7 +33,6 @@ class CodegenUtilsTests < Test::Unit::TestCase
 
     def setup
         CodegenUtils.set_react_codegen_discovery_done(false)
-        CodegenUtils.set_react_codegen_podspec_generated(false)
         Pod::Config.reset()
         @base_path = "~/app/ios"
         Pathname.pwd!(@base_path)
@@ -62,8 +61,8 @@ def testUseReactCodegenDiscovery_whenCodegenDisabled_doNothing
 
         # Assert
         assert_false(CodegenUtils.react_codegen_discovery_done())
-        assert_equal(Pod::UI.collected_messages, [])
-        assert_equal(Pod::UI.collected_warns, [])
+        assert_equal([], Pod::UI.collected_messages)
+        assert_equal([], Pod::UI.collected_warns)
     end
 
     def testUseReactCodegenDiscovery_whenDiscoveryDone_doNothing
@@ -75,8 +74,8 @@ def testUseReactCodegenDiscovery_whenDiscoveryDone_doNothing
 
         # Assert
         assert_true(CodegenUtils.react_codegen_discovery_done())
-        assert_equal(Pod::UI.collected_messages, ["Skipping use_react_native_codegen_discovery."])
-        assert_equal(Pod::UI.collected_warns, [])
+        assert_equal(["Skipping use_react_native_codegen_discovery."], Pod::UI.collected_messages)
+        assert_equal([], Pod::UI.collected_warns)
     end
 
     def testUseReactCodegenDiscovery_whenAppPathUndefined_abort
@@ -89,16 +88,16 @@ def testUseReactCodegenDiscovery_whenAppPathUndefined_abort
 
         # Assert
         assert_false(CodegenUtils.react_codegen_discovery_done())
-        assert_equal(Pod::UI.collected_messages, [])
-        assert_equal(Pod::UI.collected_warns, [
+        assert_equal([], Pod::UI.collected_messages)
+        assert_equal([
             'Error: app_path is required for use_react_native_codegen_discovery.',
             'If you are calling use_react_native_codegen_discovery! in your Podfile, please remove the call and pass `app_path` and/or `config_file_dir` to `use_react_native!`.'
-        ])
+        ], Pod::UI.collected_warns)
     end
 
-    # ============================= #
+    # =========================== #
     # Test - CleanUpCodegenFolder #
-    # ============================= #
+    # =========================== #
 
     def testCleanUpCodegenFolder_whenCleanupDone_doNothing
         # Arrange
@@ -110,9 +109,9 @@ def testCleanUpCodegenFolder_whenCleanupDone_doNothing
         CodegenUtils.clean_up_build_folder(rn_path, codegen_dir, dir_manager: DirMock, file_manager: FileMock)
 
         # Assert
-        assert_equal(FileUtils::FileUtilsStorage.rmrf_invocation_count, 0)
-        assert_equal(FileUtils::FileUtilsStorage.rmrf_paths, [])
-        assert_equal(CodegenUtils.cleanup_done(), true)
+        assert_equal(0, FileUtils::FileUtilsStorage.rmrf_invocation_count)
+        assert_equal([], FileUtils::FileUtilsStorage.rmrf_paths)
+        assert_equal(true, CodegenUtils.cleanup_done())
     end
 
     def testCleanUpCodegenFolder_whenFolderDoesNotExists_markAsCleanupDone
@@ -125,10 +124,10 @@ def testCleanUpCodegenFolder_whenFolderDoesNotExists_markAsCleanupDone
         CodegenUtils.clean_up_build_folder(rn_path, codegen_dir, dir_manager: DirMock, file_manager: FileMock)
 
         # Assert
-        assert_equal(FileUtils::FileUtilsStorage.rmrf_invocation_count, 0)
-        assert_equal(FileUtils::FileUtilsStorage.rmrf_paths, [])
-        assert_equal(DirMock.glob_invocation, [])
-        assert_equal(CodegenUtils.cleanup_done(), true)
+        assert_equal(0, FileUtils::FileUtilsStorage.rmrf_invocation_count)
+        assert_equal([], FileUtils::FileUtilsStorage.rmrf_paths)
+        assert_equal([], DirMock.glob_invocation)
+        assert_equal(true, CodegenUtils.cleanup_done())
     end
 
     def testCleanUpCodegenFolder_whenFolderExists_deleteItAndSetCleanupDone
@@ -137,29 +136,33 @@ def testCleanUpCodegenFolder_whenFolderExists_deleteItAndSetCleanupDone
         codegen_dir = "build/generated/ios"
         codegen_path = "#{@base_path}/#{codegen_dir}"
         globs = [
-            "/MyModuleSpecs/MyModule.h",
-            "#{codegen_path}/MyModuleSpecs/MyModule.mm",
-            "#{codegen_path}/react/components/MyComponent/ShadowNode.h",
-            "#{codegen_path}/react/components/MyComponent/ShadowNode.mm",
+            codegen_path
         ]
         rn_path = '../node_modules/react-native'
 
         DirMock.mocked_existing_dirs(codegen_path)
         DirMock.mocked_existing_globs(globs, "#{codegen_path}/*")
 
+        original_define_singleton_method = CodegenUtils.method(:assert_codegen_folder_is_empty)
+        CodegenUtils.define_singleton_method(:assert_codegen_folder_is_empty) do |*args, **kwargs|
+            # no-op
+        end
+
         # Act
         CodegenUtils.clean_up_build_folder(rn_path, codegen_dir, dir_manager: DirMock, file_manager: FileMock)
 
         # Assert
-        assert_equal(DirMock.exist_invocation_params, [codegen_path, codegen_path])
-        assert_equal(DirMock.glob_invocation, ["#{codegen_path}/*", "#{codegen_path}/*"])
-        assert_equal(FileUtils::FileUtilsStorage.rmrf_invocation_count, 3)
-        assert_equal(FileUtils::FileUtilsStorage.rmrf_paths, [
-            globs,
+        assert_equal([codegen_path], DirMock.exist_invocation_params)
+        assert_equal(3, FileUtils::FileUtilsStorage.rmrf_invocation_count)
+        assert_equal([
+            *globs,
             "#{rn_path}/React/Fabric/RCTThirdPartyFabricComponentsProvider.h",
             "#{rn_path}/React/Fabric/RCTThirdPartyFabricComponentsProvider.mm",
-        ])
-        assert_equal(CodegenUtils.cleanup_done(), true)
+        ], FileUtils::FileUtilsStorage.rmrf_paths)
+        assert_equal(true, CodegenUtils.cleanup_done())
+    ensure
+        # Restore original method so other tests are not affected
+        CodegenUtils.define_singleton_method(:assert_codegen_folder_is_empty, original_define_singleton_method)
     end
 
     # ===================================== #
@@ -175,7 +178,7 @@ def test_assertCodegenFolderIsEmpty_whenItDoesNotExists_doesNotAbort
         CodegenUtils.assert_codegen_folder_is_empty(codegen_path, dir_manager: DirMock)
 
         # Assert
-        assert_equal(Pod::UI.collected_warns, [])
+        assert_equal([], Pod::UI.collected_warns)
     end
 
     def test_assertCodegenFolderIsEmpty_whenItExistsAndIsEmpty_doesNotAbort
@@ -189,7 +192,7 @@ def test_assertCodegenFolderIsEmpty_whenItExistsAndIsEmpty_doesNotAbort
         CodegenUtils.assert_codegen_folder_is_empty(codegen_path, dir_manager: DirMock)
 
         # Assert
-        assert_equal(Pod::UI.collected_warns, [])
+        assert_equal([], Pod::UI.collected_warns)
     end
 
     def test_assertCodegenFolderIsEmpty_whenItIsNotEmpty_itAborts
@@ -205,9 +208,9 @@ def test_assertCodegenFolderIsEmpty_whenItIsNotEmpty_itAborts
         }
 
         # Assert
-        assert_equal(Pod::UI.collected_warns, [
+        assert_equal([
             "Unable to remove the content of ~/app/ios/./build/generated/ios folder. Please run rm -rf ~/app/ios/./build/generated/ios and try again."
-        ])
+        ], Pod::UI.collected_warns)
     end
 
     private

packages/react-native/scripts/cocoapods/__tests__/fabric-test.rb

@@ -52,6 +52,6 @@ def check_pod(name, path: nil, modular_headers: nil, podspec: nil)
         if modular_headers != nil then expected_params[:modular_headers] = modular_headers end
         if podspec != nil then expected_params[:podspec] = podspec end
 
-        assert_equal(params, expected_params)
+        assert_equal(expected_params, params)
     end
 end

packages/react-native/scripts/cocoapods/__tests__/jsengine-test.rb

@@ -37,12 +37,11 @@ def test_setupHermes_installsPods
         setup_hermes!(:react_native_path => @react_native_path)
 
         # Assert
-        assert_equal($podInvocationCount, 3)
-        assert_equal($podInvocation["React-jsi"][:path], "../../ReactCommon/jsi")
+        assert_equal(2, $podInvocationCount)
         hermes_engine_pod_invocation = $podInvocation["hermes-engine"]
-        assert_equal(hermes_engine_pod_invocation[:podspec], "../../sdks/hermes-engine/hermes-engine.podspec")
-        assert_equal(hermes_engine_pod_invocation[:tag], "")
-        assert_equal($podInvocation["React-hermes"][:path], "../../ReactCommon/hermes")
+        assert_equal("../../sdks/hermes-engine/hermes-engine.podspec", hermes_engine_pod_invocation[:podspec])
+        assert_equal("", hermes_engine_pod_invocation[:tag])
+        assert_equal("../../ReactCommon/hermes", $podInvocation["React-hermes"][:path])
     end
 
 end

packages/react-native/scripts/cocoapods/__tests__/local_podspec_patch-test.rb

@@ -34,12 +34,12 @@ def test_podsToUpdate_whenNoFilesExists_returnLocalPodspecs
         local_podspec = LocalPodspecPatch.pods_to_update(:react_native_path => react_native_path, dir_manager: DirMock, file_manager: FileMock)
 
         # Assert
-        assert_equal(local_podspec, [])
-        assert_equal(DirMock.glob_invocation, ["#{react_native_path}/third-party-podspecs/*"])
-        assert_equal(FileMock.exist_invocation_params, [
+        assert_equal([], local_podspec)
+        assert_equal(["#{react_native_path}/third-party-podspecs/*"], DirMock.glob_invocation)
+        assert_equal([
             FileMock.join(mocked_pwd, "Pods/Local Podspecs", "boost.podspec.json"),
             FileMock.join(mocked_pwd, "Pods/Local Podspecs", "DoubleConversion.podspec.json"),
-        ])
+        ], FileMock.exist_invocation_params)
     end
 
     def test_podsToUpdate_whenFilesExistsWithSameVersions_returnsEmpty
@@ -53,12 +53,12 @@ def test_podsToUpdate_whenFilesExistsWithSameVersions_returnsEmpty
         local_podspec = LocalPodspecPatch.pods_to_update(:react_native_path => react_native_path, dir_manager: DirMock, file_manager: FileMock)
 
         # Assert
-        assert_equal(local_podspec, [])
-        assert_equal(DirMock.glob_invocation, ["#{react_native_path}/third-party-podspecs/*"])
-        assert_equal(FileMock.exist_invocation_params, [
+        assert_equal([], local_podspec)
+        assert_equal(["#{react_native_path}/third-party-podspecs/*"], DirMock.glob_invocation)
+        assert_equal([
             FileMock.join(mocked_pwd, "Pods/Local Podspecs", "boost.podspec.json"),
             FileMock.join(mocked_pwd, "Pods/Local Podspecs", "DoubleConversion.podspec.json"),
-        ])
+        ], FileMock.exist_invocation_params)
     end
 
     def test_podsToUpdate_whenFilesExistsWithDifferentVersions_returnsThem
@@ -72,15 +72,15 @@ def test_podsToUpdate_whenFilesExistsWithDifferentVersions_returnsThem
         local_podspec = LocalPodspecPatch.pods_to_update(:react_native_path => react_native_path, dir_manager: DirMock, file_manager: FileMock)
 
         # Assert
-        assert_equal(local_podspec, [
+        assert_equal([
             "boost",
             "DoubleConversion"
-        ])
-        assert_equal(DirMock.glob_invocation, ["#{react_native_path}/third-party-podspecs/*"])
-        assert_equal(FileMock.exist_invocation_params, [
+        ], local_podspec)
+        assert_equal(["#{react_native_path}/third-party-podspecs/*"], DirMock.glob_invocation)
+        assert_equal([
             FileMock.join(mocked_pwd, "Pods/Local Podspecs", "boost.podspec.json"),
             FileMock.join(mocked_pwd, "Pods/Local Podspecs", "DoubleConversion.podspec.json"),
-        ])
+        ], FileMock.exist_invocation_params)
     end
 
     # ======================================== #
@@ -101,10 +101,10 @@ def test_patchDetectChangesWithPodfile_whenAlreadyChanged_returnSameChangeSet()
 
         new_changes = Pod::Lockfile.new().patch_detect_changes_with_podfile(changes)
 
-        assert_equal(new_changes, {
+        assert_equal({
             :unchanged => ["some_pod"],
             :changed => ["boost", "DoubleConversion", "another_pod"]
-        })
+        }, new_changes)
     end
 
     def test_patchDetectChangesWithPodfile_whenLocalPodsUnchanged_movesLocalPodsToChangeSet()
@@ -122,10 +122,10 @@ def test_patchDetectChangesWithPodfile_whenLocalPodsUnchanged_movesLocalPodsToCh
 
         new_changes = Pod::Lockfile.new().patch_detect_changes_with_podfile(changes)
 
-        assert_equal(new_changes, {
+        assert_equal({
             :unchanged => ["first_pod"],
             :changed => ["another_pod", "boost", "DoubleConversion"]
-        })
+        }, new_changes)
     end
 
     # ========= #