Skip to content

feat(ios): sort simulators to get iOS first #2153

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.

Sign up for GitHub

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 2 commits into from
Nov 2, 2023
Merged

feat(ios): sort simulators to get iOS first #2153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d36613f
feat(ios): sort simulators to get ios first
szymonrybczak Nov 2, 2023
9bd6445
feat: add tests
szymonrybczak Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions packages/cli-platform-ios/src/tools/__tests__/findMatchingSimulator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,4 +1064,54 @@ describe('findMatchingSimulator', () => {
version: 'tvOS 11.2',
});
});

it('should sort simulator to get iOS ones first', () => {
expect(
findMatchingSimulator({
devices: {
'com.apple.CoreSimulator.SimRuntime.tvOS-11-2': [
{
state: 'Shutdown',
availability: '(available)',
name: 'Apple TV',
udid: '816C30EA-38EA-41AC-BFDA-96FB632D522E',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'Apple TV 4K',
udid: 'BCBB7E4B-D872-4D61-BC61-7C9805551075',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'Apple TV 4K (at 1080p)',
udid: '1DE12308-1C14-4F0F-991E-A3ADC41BDFFC',
},
],
'com.apple.CoreSimulator.SimRuntime.iOS-16-2': [
{
lastBootedAt: '2023-05-09T11:08:32Z',
udid: '54B1D3DE-A943-4867-BA6A-B82BFE3A7904',
availability: '(available)',
state: 'Shutdown',
name: 'iPhone 14',
},
{
lastBootedAt: '2023-04-06T12:34:01Z',
udid: '816A7D47-A205-4F57-AE19-E5CB842B6304',
availability: '(available)',
state: 'Shutdown',
name: 'iPhone 14 Plus',
},
],
},
}),
).toEqual({
udid: '54B1D3DE-A943-4867-BA6A-B82BFE3A7904',
name: 'iPhone 14',
state: 'Shutdown',
version: 'iOS 16.2',
});
});
});
10 changes: 8 additions & 2 deletions packages/cli-platform-ios/src/tools/findMatchingSimulator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,14 @@ function findMatchingSimulator(
let match;
let fallbackMatch;

for (const versionDescriptor in devices) {
const device = devices[versionDescriptor];
const sortedDevices = Object.fromEntries(
Object.entries(devices).sort(
(a, b) => Number(b[0].includes('iOS')) - Number(a[0].includes('iOS')),
),
);

for (const versionDescriptor in sortedDevices) {
const device = sortedDevices[versionDescriptor];
let version = versionDescriptor;

if (/^com\.apple\.CoreSimulator\.SimRuntime\./g.test(version)) {
Expand Down