diff --git a/IntegrationTests/AccessibilityManagerTest.js b/packages/rn-tester/IntegrationTests/AccessibilityManagerTest.js similarity index 100% rename from IntegrationTests/AccessibilityManagerTest.js rename to packages/rn-tester/IntegrationTests/AccessibilityManagerTest.js diff --git a/IntegrationTests/AppEventsTest.js b/packages/rn-tester/IntegrationTests/AppEventsTest.js similarity index 100% rename from IntegrationTests/AppEventsTest.js rename to packages/rn-tester/IntegrationTests/AppEventsTest.js diff --git a/IntegrationTests/GlobalEvalWithSourceUrlTest.js b/packages/rn-tester/IntegrationTests/GlobalEvalWithSourceUrlTest.js similarity index 100% rename from IntegrationTests/GlobalEvalWithSourceUrlTest.js rename to packages/rn-tester/IntegrationTests/GlobalEvalWithSourceUrlTest.js diff --git a/IntegrationTests/ImageCachePolicyTest.js b/packages/rn-tester/IntegrationTests/ImageCachePolicyTest.js similarity index 100% rename from IntegrationTests/ImageCachePolicyTest.js rename to packages/rn-tester/IntegrationTests/ImageCachePolicyTest.js diff --git a/IntegrationTests/ImageSnapshotTest.js b/packages/rn-tester/IntegrationTests/ImageSnapshotTest.js similarity index 100% rename from IntegrationTests/ImageSnapshotTest.js rename to packages/rn-tester/IntegrationTests/ImageSnapshotTest.js diff --git a/IntegrationTests/IntegrationTestHarnessTest.js b/packages/rn-tester/IntegrationTests/IntegrationTestHarnessTest.js similarity index 100% rename from IntegrationTests/IntegrationTestHarnessTest.js rename to packages/rn-tester/IntegrationTests/IntegrationTestHarnessTest.js diff --git a/IntegrationTests/IntegrationTestsApp.js b/packages/rn-tester/IntegrationTests/IntegrationTestsApp.js similarity index 100% rename from IntegrationTests/IntegrationTestsApp.js rename to packages/rn-tester/IntegrationTests/IntegrationTestsApp.js diff --git a/IntegrationTests/LayoutEventsTest.js b/packages/rn-tester/IntegrationTests/LayoutEventsTest.js similarity index 100% rename from IntegrationTests/LayoutEventsTest.js rename to packages/rn-tester/IntegrationTests/LayoutEventsTest.js diff --git a/IntegrationTests/LoggingTestModule.js b/packages/rn-tester/IntegrationTests/LoggingTestModule.js similarity index 100% rename from IntegrationTests/LoggingTestModule.js rename to packages/rn-tester/IntegrationTests/LoggingTestModule.js diff --git a/IntegrationTests/PromiseTest.js b/packages/rn-tester/IntegrationTests/PromiseTest.js similarity index 100% rename from IntegrationTests/PromiseTest.js rename to packages/rn-tester/IntegrationTests/PromiseTest.js diff --git a/IntegrationTests/PropertiesUpdateTest.js b/packages/rn-tester/IntegrationTests/PropertiesUpdateTest.js similarity index 100% rename from IntegrationTests/PropertiesUpdateTest.js rename to packages/rn-tester/IntegrationTests/PropertiesUpdateTest.js diff --git a/IntegrationTests/RCTRootViewIntegrationTestApp.js b/packages/rn-tester/IntegrationTests/RCTRootViewIntegrationTestApp.js similarity index 100% rename from IntegrationTests/RCTRootViewIntegrationTestApp.js rename to packages/rn-tester/IntegrationTests/RCTRootViewIntegrationTestApp.js diff --git a/IntegrationTests/ReactContentSizeUpdateTest.js b/packages/rn-tester/IntegrationTests/ReactContentSizeUpdateTest.js similarity index 100% rename from IntegrationTests/ReactContentSizeUpdateTest.js rename to packages/rn-tester/IntegrationTests/ReactContentSizeUpdateTest.js diff --git a/IntegrationTests/SimpleSnapshotTest.js b/packages/rn-tester/IntegrationTests/SimpleSnapshotTest.js similarity index 100% rename from IntegrationTests/SimpleSnapshotTest.js rename to packages/rn-tester/IntegrationTests/SimpleSnapshotTest.js diff --git a/IntegrationTests/SizeFlexibilityUpdateTest.js b/packages/rn-tester/IntegrationTests/SizeFlexibilityUpdateTest.js similarity index 100% rename from IntegrationTests/SizeFlexibilityUpdateTest.js rename to packages/rn-tester/IntegrationTests/SizeFlexibilityUpdateTest.js diff --git a/IntegrationTests/SyncMethodTest.js b/packages/rn-tester/IntegrationTests/SyncMethodTest.js similarity index 100% rename from IntegrationTests/SyncMethodTest.js rename to packages/rn-tester/IntegrationTests/SyncMethodTest.js diff --git a/IntegrationTests/TimersTest.js b/packages/rn-tester/IntegrationTests/TimersTest.js similarity index 100% rename from IntegrationTests/TimersTest.js rename to packages/rn-tester/IntegrationTests/TimersTest.js diff --git a/IntegrationTests/WebSocketTest.js b/packages/rn-tester/IntegrationTests/WebSocketTest.js similarity index 100% rename from IntegrationTests/WebSocketTest.js rename to packages/rn-tester/IntegrationTests/WebSocketTest.js diff --git a/IntegrationTests/blue_square.png b/packages/rn-tester/IntegrationTests/blue_square.png similarity index 100% rename from IntegrationTests/blue_square.png rename to packages/rn-tester/IntegrationTests/blue_square.png diff --git a/IntegrationTests/launchWebSocketServer.sh b/packages/rn-tester/IntegrationTests/launchWebSocketServer.sh similarity index 100% rename from IntegrationTests/launchWebSocketServer.sh rename to packages/rn-tester/IntegrationTests/launchWebSocketServer.sh diff --git a/IntegrationTests/red_square.png b/packages/rn-tester/IntegrationTests/red_square.png similarity index 100% rename from IntegrationTests/red_square.png rename to packages/rn-tester/IntegrationTests/red_square.png diff --git a/IntegrationTests/websocket_integration_test_server.js b/packages/rn-tester/IntegrationTests/websocket_integration_test_server.js similarity index 100% rename from IntegrationTests/websocket_integration_test_server.js rename to packages/rn-tester/IntegrationTests/websocket_integration_test_server.js diff --git a/packages/rn-tester/RNTester/RNTester.xctestplan b/packages/rn-tester/RNTester/RNTester.xctestplan index 3fcd0a248433aa..147173b22f8bc4 100644 --- a/packages/rn-tester/RNTester/RNTester.xctestplan +++ b/packages/rn-tester/RNTester/RNTester.xctestplan @@ -28,7 +28,6 @@ }, "testTargets" : [ { - "enabled": false, "target" : { "containerPath" : "container:RNTesterPods.xcodeproj", "identifier" : "E7DB215222B2F332005AC45F", diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh index 490e7ada8b233a..4ba9f4eea03599 100755 --- a/scripts/objc-test.sh +++ b/scripts/objc-test.sh @@ -106,8 +106,7 @@ xcbeautifyFormat() { } preloadBundlesRNIntegrationTests() { - # Preload IntegrationTests bundles (/) - # TODO(T149119847): These need to be relocated into a dir with a Metro config + # Preload IntegrationTests bundles (packages/rn-tester/) curl -s 'http://localhost:8081/IntegrationTests/IntegrationTestsApp.bundle?platform=ios&dev=true' -o /dev/null curl -s 'http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundle?platform=ios&dev=true' -o /dev/null } @@ -127,15 +126,14 @@ main() { # Start the WebSocket test server echo "Launch WebSocket Server" - sh "$ROOT/IntegrationTests/launchWebSocketServer.sh" & + sh "./IntegrationTests/launchWebSocketServer.sh" & waitForWebSocketServer # Start the packager yarn start --max-workers=1 || echo "Can't start packager automatically" & waitForPackager preloadBundlesRNTester - # TODO(T149119847) - # preloadBundlesRNIntegrationTests + preloadBundlesRNIntegrationTests # Build and run tests. if [ -x "$(command -v xcbeautify)" ]; then