From ff735613e4c6bd57d65e4172972ebdbc55c2c08c Mon Sep 17 00:00:00 2001 From: Mark de Vocht Date: Sun, 26 Oct 2025 13:17:33 +0200 Subject: [PATCH 1/4] RNNav iOS 18 Compatibility #7990 --- e2e/Orientation.test.js | 3 +++ package.json | 2 +- scripts/test-unit.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/e2e/Orientation.test.js b/e2e/Orientation.test.js index d45449477a6..05c0c5a71db 100644 --- a/e2e/Orientation.test.js +++ b/e2e/Orientation.test.js @@ -40,6 +40,9 @@ describe.e2e(':ios: orientation', () => { await expect(element(by.id(TestIDs.LANDSCAPE_ELEMENT))).toBeVisible(); await device.setOrientation('portrait'); await expect(element(by.id(TestIDs.LANDSCAPE_ELEMENT))).toBeVisible(); + await device.setOrientation('landscape'); + await expect(element(by.id(TestIDs.LANDSCAPE_ELEMENT))).toBeVisible(); await elementById(TestIDs.DISMISS_BTN).tap(); + await device.setOrientation('portrait'); }); }); diff --git a/package.json b/package.json index 78fbb4085db..fc84d796c75 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "type": "ios.simulator", "device": { "type": "iPhone 13 Pro Max", - "os": "15.5" + "os": "18.5" } }, "genymotion.emulator.name": { diff --git a/scripts/test-unit.js b/scripts/test-unit.js index 50a097fb87d..a14179d4026 100644 --- a/scripts/test-unit.js +++ b/scripts/test-unit.js @@ -26,7 +26,7 @@ function runAndroidUnitTests() { function runIosUnitTests() { exec.execSync('npm run build'); exec.execSync('npm run pod-install'); - testTarget('playground', 'iPhone 13', '15.5'); + testTarget('playground', 'iPhone 13', '18.5'); } function testTarget(scheme, device, OS = 'latest') { From 3a899f9e54c6333e9478c8cb630bc8347527c652 Mon Sep 17 00:00:00 2001 From: Mark de Vocht Date: Sun, 26 Oct 2025 14:46:31 +0200 Subject: [PATCH 2/4] update missing device --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc84d796c75..78fbb4085db 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "type": "ios.simulator", "device": { "type": "iPhone 13 Pro Max", - "os": "18.5" + "os": "15.5" } }, "genymotion.emulator.name": { From d75d97ecd9c71ed427a98643a76860d0a91904c6 Mon Sep 17 00:00:00 2001 From: Mark de Vocht Date: Sun, 26 Oct 2025 15:21:17 +0200 Subject: [PATCH 3/4] device update --- scripts/test-unit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-unit.js b/scripts/test-unit.js index a14179d4026..50a097fb87d 100644 --- a/scripts/test-unit.js +++ b/scripts/test-unit.js @@ -26,7 +26,7 @@ function runAndroidUnitTests() { function runIosUnitTests() { exec.execSync('npm run build'); exec.execSync('npm run pod-install'); - testTarget('playground', 'iPhone 13', '18.5'); + testTarget('playground', 'iPhone 13', '15.5'); } function testTarget(scheme, device, OS = 'latest') { From 41fda3adbb509ccdba883bf56ef91dde012f8ed9 Mon Sep 17 00:00:00 2001 From: Mark de Vocht Date: Mon, 27 Oct 2025 11:05:29 +0200 Subject: [PATCH 4/4] update for Orientation test - better implementation of setOrientation --- e2e/Orientation.test.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/e2e/Orientation.test.js b/e2e/Orientation.test.js index 05c0c5a71db..959fc6efe1f 100644 --- a/e2e/Orientation.test.js +++ b/e2e/Orientation.test.js @@ -12,6 +12,10 @@ describe.e2e(':ios: orientation', () => { await elementById(TestIDs.SHOW_ORIENTATION_SCREEN).tap(); }); + afterEach(() => { + device.setOrientation('portrait'); + }); + it('landscape and portrait array', async () => { await elementById(TestIDs.LANDSCAPE_PORTRAIT_ORIENTATION_BTN).tap(); await expect(element(by.id(TestIDs.PORTRAIT_ELEMENT))).toBeVisible(); @@ -43,6 +47,5 @@ describe.e2e(':ios: orientation', () => { await device.setOrientation('landscape'); await expect(element(by.id(TestIDs.LANDSCAPE_ELEMENT))).toBeVisible(); await elementById(TestIDs.DISMISS_BTN).tap(); - await device.setOrientation('portrait'); }); });