-
Notifications
You must be signed in to change notification settings - Fork 1.9k
iOS 26 compatibility #4894
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
iOS 26 compatibility #4894
Changes from all commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
f97d41b
os version set to iOS 26
markdevocht 29d3fb0
cleanup
markdevocht cf94dc4
update simulator
markdevocht fd71962
webview test snapshot update
markdevocht 45fb08a
element-screenshot test snapshot update
markdevocht dac7f07
update with timeout
markdevocht 03a3f35
final test update
markdevocht a578b8b
update for newArch
markdevocht daa9316
screenshot updates
markdevocht 3eca976
crash test update
markdevocht 56736c1
sanity button update
markdevocht 9d2d0e7
chore: upgrade allure adapter
noomorph 7719fcd
update of snapshots for webview
markdevocht 8a7dd49
chore: upgrade adapter
noomorph 6a1a98e
more updates
markdevocht 064cb25
using xcode 26.1
markdevocht 744bc50
Revert "chore: upgrade allure adapter"
markdevocht 089b133
update of flaky test
markdevocht d3bc157
os version set to iOS 26
markdevocht 93543bb
cleanup
markdevocht 4af642a
update simulator
markdevocht 82acb00
webview test snapshot update
markdevocht a5805f5
element-screenshot test snapshot update
markdevocht 986eead
update with timeout
markdevocht f5fe264
final test update
markdevocht 5963003
update for newArch
markdevocht b8f0872
screenshot updates
markdevocht b1400d2
crash test update
markdevocht 6ef999d
sanity button update
markdevocht 1a742be
chore: upgrade allure adapter
noomorph 085d953
update of snapshots for webview
markdevocht f2b9926
chore: upgrade adapter
noomorph c1a6cc4
more updates
markdevocht 3d8218f
using xcode 26.1
markdevocht 8f11d3d
Revert "chore: upgrade allure adapter"
markdevocht b84bf84
update of flaky test
markdevocht 0a963f5
Merge branch 'feat/ios26' of github.com:wix/Detox into feat/ios26
markdevocht 7e29c7f
Added launchArg 'skipDemoActiveNotification' handling so we don't nee…
markdevocht 836d0d6
reversed logic
markdevocht b06daa7
update for tests
markdevocht File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| 16.1 | ||
| 26.1 |
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
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
Binary file modified
BIN
-25.5 KB
(78%)
detox/test/e2e/assets/cross-origin-frame.clear-text.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-24.8 KB
(79%)
detox/test/e2e/assets/cross-origin-frame.replace-text.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-24.8 KB
(79%)
detox/test/e2e/assets/cross-origin-frame.replace-text.ios.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-24.8 KB
(79%)
detox/test/e2e/assets/cross-origin-frame.type-text-in.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-24.8 KB
(79%)
detox/test/e2e/assets/cross-origin-frame.type-text-in.ios.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-585 Bytes
(95%)
detox/test/e2e/assets/elementScreenshot.horiz.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-3.13 KB
(91%)
detox/test/e2e/assets/elementScreenshot.vert.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-55.5 KB
(63%)
detox/test/e2e/assets/focus-on-content-editable-webview.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-55.5 KB
(63%)
detox/test/e2e/assets/focus-on-content-editable-webview.ios.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-28.2 KB
(81%)
detox/test/e2e/assets/focus-on-input-webview.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-55.7 KB
(63%)
detox/test/e2e/assets/move-cursor-to-end-content-editable-webview.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-55.7 KB
(63%)
detox/test/e2e/assets/move-cursor-to-end-content-editable-webview.ios.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-28 KB
(82%)
detox/test/e2e/assets/move-cursor-to-end-webview.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-10.3 KB
(86%)
detox/test/e2e/assets/scroll-to-view-webview.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-55.7 KB
(66%)
detox/test/e2e/assets/select-all-text-in-content-editable-webview.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-55.7 KB
(66%)
detox/test/e2e/assets/select-all-text-in-content-editable-webview.ios.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-27.8 KB
(84%)
detox/test/e2e/assets/select-all-text-in-webview.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-26.5 KB
(77%)
detox/test/e2e/assets/tap-on-cross-origin-frame-element.ios.new-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-26.5 KB
(77%)
detox/test/e2e/assets/tap-on-cross-origin-frame-element.ios.png
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /** | ||
| * Utility to get device OS version information | ||
| */ | ||
|
|
||
| let cachedIOSVersion = null; | ||
|
|
||
| /** | ||
| * Gets the iOS major version number | ||
| * @returns {Promise<number|null>} The iOS major version (e.g., 17, 18, 26) or null if not iOS | ||
| */ | ||
| async function getIOSMajorVersion() { | ||
| if (cachedIOSVersion !== null) { | ||
| return cachedIOSVersion; | ||
| } | ||
|
|
||
| try { | ||
| const { device: deviceHandle } = require('detox'); | ||
| if (deviceHandle && deviceHandle.getPlatform && deviceHandle.getPlatform() !== 'ios') { | ||
| cachedIOSVersion = null; | ||
| return null; | ||
| } | ||
|
|
||
| if (deviceHandle && deviceHandle._device && deviceHandle._device.deviceConfig) { | ||
| const osVersion = deviceHandle._device.deviceConfig.device?.os; | ||
| if (osVersion) { | ||
| const majorVersion = parseInt(osVersion.split('.')[0], 10); | ||
| cachedIOSVersion = majorVersion; | ||
| return majorVersion; | ||
| } | ||
| } | ||
| } catch (e) { | ||
| console.warn('Could not determine iOS version, assuming iOS 18+'); | ||
| } | ||
|
|
||
| cachedIOSVersion = 18; | ||
| return cachedIOSVersion; | ||
| } | ||
|
|
||
| /** | ||
| * Checks if iOS version is 18 or higher | ||
| * @returns {Promise<boolean>} | ||
| */ | ||
| async function isIOS18OrHigher() { | ||
| const majorVersion = await getIOSMajorVersion(); | ||
| if (majorVersion === null) { | ||
| return false; | ||
| } | ||
| return majorVersion >= 18; | ||
| } | ||
|
|
||
| module.exports = { | ||
| getIOSMajorVersion, | ||
| isIOS18OrHigher, | ||
| }; | ||
|
|
||
|
|
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
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.
Uh oh!
There was an error while loading. Please reload this page.