fix(test): fix RNTester iOS unit and integration tests #53848
+330
−277
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,9 +7,9 @@ inputs: | |
| ruby-version: | ||
| description: The version of ruby that must be used | ||
| default: 2.6.10 | ||
| 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-integration-tests == 'true' }} | ||
| uses: ./.github/actions/prepare-ios-tests | ||
| - name: Set HERMES_ENGINE_TARBALL_PATH envvar if Hermes tarball is present | ||
| shell: bash | ||
|
|
@@ -134,12 +134,12 @@ 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-integration-tests == 'true' }} | ||
| shell: bash | ||
| run: yarn test-ios | ||
|
|
||
| - name: Zip Derived data folder | ||
| if: ${{ inputs.run-unit-integration-tests == 'true' }} | ||
| shell: bash | ||
| run: | | ||
| echo "zipping tests results" | ||
|
|
@@ -148,7 +148,7 @@ runs: | |
| tar -zcvf xcresults.tar.gz $XCRESULT_PATH | ||
| - name: Upload artifact | ||
| uses: actions/[email protected] | ||
| if: ${{ inputs.run-unit-integration-tests == 'true' }} | ||
| with: | ||
| name: xcresults | ||
| path: /Users/distiller/Library/Developer/Xcode/xcresults.tar.gz | ||
|
|
@@ -159,7 +159,7 @@ runs: | |
| name: RNTesterApp-NewArch-${{ inputs.flavor }} | ||
| path: ${{ env.app-path }} | ||
| - name: Store test results | ||
| if: ${{ inputs.run-unit-integration-tests == 'true' }} | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: test-results | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,6 @@ class CodegenUtilsTests < Test::Unit::TestCase | |
|
|
||
| def setup | ||
| CodegenUtils.set_react_codegen_discovery_done(false) | ||
| Pod::Config.reset() | ||
| @base_path = "~/app/ios" | ||
| Pathname.pwd!(@base_path) | ||
|
|
@@ -96,9 +95,9 @@ def testUseReactCodegenDiscovery_whenAppPathUndefined_abort | |
| ]) | ||
| end | ||
|
|
||
| # =========================== # | ||
| # Test - CleanUpCodegenFolder # | ||
| # =========================== # | ||
|
|
||
| def testCleanUpCodegenFolder_whenCleanupDone_doNothing | ||
| # Arrange | ||
|
|
@@ -137,29 +136,33 @@ def testCleanUpCodegenFolder_whenFolderExists_deleteItAndSetCleanupDone | |
| codegen_dir = "build/generated/ios" | ||
| codegen_path = "#{@base_path}/#{codegen_dir}" | ||
| globs = [ | ||
| 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 | ||
|
|
||
|
Comment on lines
+146
to
+150
There was a problem hiding this comment. This mock was missing |
||
| # 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]) | ||
|
||
| assert_equal(FileUtils::FileUtilsStorage.rmrf_invocation_count, 3) | ||
| assert_equal(FileUtils::FileUtilsStorage.rmrf_paths, [ | ||
| *globs, | ||
| "#{rn_path}/React/Fabric/RCTThirdPartyFabricComponentsProvider.h", | ||
| "#{rn_path}/React/Fabric/RCTThirdPartyFabricComponentsProvider.mm", | ||
| ]) | ||
| assert_equal(CodegenUtils.cleanup_done(), true) | ||
| ensure | ||
| # Restore original method so other tests are not affected | ||
| CodegenUtils.define_singleton_method(:assert_codegen_folder_is_empty, original_define_singleton_method) | ||
| end | ||
|
|
||
| # ===================================== # | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,8 +37,7 @@ def test_setupHermes_installsPods | |
| setup_hermes!(:react_native_path => @react_native_path) | ||
|
|
||
| # Assert | ||
| assert_equal($podInvocationCount, 2) | ||
|
||
| 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], "") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,12 +71,12 @@ def test_modifyFlagsForNewArch_whenOnOldArch_doNothing | |
| NewArchitectureHelper.modify_flags_for_new_architecture(installer, false) | ||
|
|
||
| # Assert | ||
| assert_equal(first_xcconfig.attributes["OTHER_CPLUSPLUSFLAGS"], "$(inherited) ") | ||
| assert_equal(first_xcconfig.save_as_invocation, ["a/path/First.xcconfig"]) | ||
| assert_equal(second_xcconfig.attributes["OTHER_CPLUSPLUSFLAGS"], "$(inherited) ") | ||
| assert_equal(second_xcconfig.save_as_invocation, ["a/path/Second.xcconfig"]) | ||
| assert_equal(react_core_debug_config.build_settings["OTHER_CPLUSPLUSFLAGS"], "$(inherited) ") | ||
| assert_equal(react_core_release_config.build_settings["OTHER_CPLUSPLUSFLAGS"], "$(inherited) ") | ||
|
||
| assert_equal(yoga_debug_config.build_settings["OTHER_CPLUSPLUSFLAGS"], "$(inherited)") | ||
| assert_equal(yoga_release_config.build_settings["OTHER_CPLUSPLUSFLAGS"], "$(inherited)") | ||
| end | ||
|
|
@@ -101,15 +101,15 @@ def test_modifyFlagsForNewArch_whenOnNewArchAndIsRelease_updateFlags | |
| NewArchitectureHelper.modify_flags_for_new_architecture(installer, true) | ||
|
|
||
| # Assert | ||
| assert_equal(first_xcconfig.attributes["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 ") | ||
| assert_nil(first_xcconfig.attributes["OTHER_CFLAGS"]) | ||
| assert_equal(first_xcconfig.save_as_invocation, ["a/path/First.xcconfig"]) | ||
| assert_equal(second_xcconfig.attributes["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 ") | ||
| assert_nil(second_xcconfig.attributes["OTHER_CFLAGS"]) | ||
| assert_equal(second_xcconfig.save_as_invocation, ["a/path/Second.xcconfig"]) | ||
| assert_equal(react_core_debug_config.build_settings["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 ") | ||
| assert_nil(react_core_debug_config.build_settings["OTHER_CFLAGS"]) | ||
| assert_equal(react_core_release_config.build_settings["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 ") | ||
| assert_nil(react_core_release_config.build_settings["OTHER_CFLAGS"]) | ||
| assert_equal(yoga_debug_config.build_settings["OTHER_CPLUSPLUSFLAGS"], "$(inherited)") | ||
| assert_nil(yoga_debug_config.build_settings["OTHER_CFLAGS"]) | ||
|
|
@@ -125,22 +125,30 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths | |
| spec = SpecMock.new | ||
|
|
||
| # Act | ||
| ENV["RCT_NEW_ARCH_ENABLED"] = "1" | ||
| NewArchitectureHelper.install_modules_dependencies(spec, true, '2024.10.14.00') | ||
|
|
||
| # Assert | ||
|
Comment on lines
-131
to
-132
There was a problem hiding this comment. This is unused. The |
||
| assert_equal(spec.compiler_flags, "-DRCT_NEW_ARCH_ENABLED=1") | ||
| assert_equal( | ||
| spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], | ||
| [ | ||
| "\"$(PODS_ROOT)/Headers/Private/Yoga\"", | ||
| "$(PODS_ROOT)/glog", | ||
| "$(PODS_ROOT)/boost", | ||
| "$(PODS_ROOT)/DoubleConversion", | ||
| "$(PODS_ROOT)/fast_float/include", | ||
| "$(PODS_ROOT)/fmt/include", | ||
| "$(PODS_ROOT)/SocketRocket", | ||
| "$(PODS_ROOT)/RCT-Folly" | ||
| ] | ||
| ) | ||
|
Comment on lines
135
to
145
There was a problem hiding this comment. This apparently is the correct baseline currently |
||
| assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++20") | ||
| assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 ") | ||
|
||
| assert_equal( | ||
| spec.dependencies, | ||
| [ | ||
| { :dependency_name => "React-Core" }, | ||
| { :dependency_name => "React-RCTFabric" }, | ||
| { :dependency_name => "ReactCodegen" }, | ||
| { :dependency_name => "RCTRequired" }, | ||
|
|
@@ -156,33 +164,42 @@ def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPaths | |
| { :dependency_name => "React-debug" }, | ||
| { :dependency_name => "React-ImageManager" }, | ||
| { :dependency_name => "React-rendererdebug" }, | ||
| { :dependency_name => "React-jsi" }, | ||
| { :dependency_name => "React-renderercss" }, | ||
| { :dependency_name => "hermes-engine" }, | ||
| { :dependency_name => "glog" }, | ||
| { :dependency_name => "boost" }, | ||
| { :dependency_name => "DoubleConversion" }, | ||
| { :dependency_name => "fast_float" }, | ||
| { :dependency_name => "fmt" }, | ||
| { :dependency_name => "RCT-Folly" }, | ||
| { :dependency_name => "SocketRocket" }, | ||
| { :dependency_name => "RCT-Folly/Fabric" }, | ||
| ] | ||
| ) | ||
| end | ||
|
|
||
| def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompilerFlagsArePresent_itInstallDependenciesAndPreserveOtherSettings | ||
| # Arrange | ||
| spec = SpecMock.new | ||
| spec.compiler_flags = '' | ||
| other_flags_arr = ["\"$(ReactNativeDependencies)/boost\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCodegen/ReactCodegen.framework/Headers\""] | ||
| spec.pod_target_xcconfig = { | ||
| "HEADER_SEARCH_PATHS" => other_flags_arr.join(" ") | ||
| } | ||
|
|
||
| # Act | ||
| ENV["RCT_NEW_ARCH_ENABLED"] = nil | ||
| NewArchitectureHelper.install_modules_dependencies(spec, false, '2024.10.14.00') | ||
|
|
||
| # Assert | ||
| assert_equal(Helpers::Constants.folly_config[:compiler_flags], "#{NewArchitectureHelper.folly_compiler_flags}") | ||
| assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], [*other_flags_arr, '"$(PODS_ROOT)/Headers/Private/Yoga"', '$(PODS_ROOT)/glog', '$(PODS_ROOT)/boost', '$(PODS_ROOT)/DoubleConversion', '$(PODS_ROOT)/fast_float/include', '$(PODS_ROOT)/fmt/include', '$(PODS_ROOT)/SocketRocket', '$(PODS_ROOT)/RCT-Folly']) | ||
| assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++20") | ||
| assert_equal( | ||
| spec.dependencies, | ||
| [ | ||
| { :dependency_name => "React-Core" }, | ||
| { :dependency_name => "React-RCTFabric" }, | ||
| { :dependency_name => "ReactCodegen" }, | ||
| { :dependency_name => "RCTRequired" }, | ||
|
|
@@ -198,8 +215,16 @@ def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompiler | |
| { :dependency_name => "React-debug" }, | ||
| { :dependency_name => "React-ImageManager" }, | ||
| { :dependency_name => "React-rendererdebug" }, | ||
| { :dependency_name => "React-jsi" }, | ||
| { :dependency_name => "React-renderercss" }, | ||
| { :dependency_name => "hermes-engine" }, | ||
| { :dependency_name => "glog" }, | ||
| { :dependency_name => "boost" }, | ||
| { :dependency_name => "DoubleConversion" }, | ||
| { :dependency_name => "fast_float" }, | ||
| { :dependency_name => "fmt" }, | ||
| { :dependency_name => "RCT-Folly" }, | ||
| { :dependency_name => "SocketRocket" }, | ||
| ] | ||
| ) | ||
| end | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,5 +17,5 @@ def self.write_to_path(hash, path) | |
| def self.reset() | ||
| @@path_to_file_mapping.clear | ||
| end | ||
| end | ||
| end | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this baseline, these files apparently are no longer present anywhere