Skip to content

Fixed iOS simulator naming problem (name with brackets) in latest Xcode update #460

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 3 commits into from
Jul 7, 2019
Merged

Fixed iOS simulator naming problem (name with brackets) in latest Xcode update #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbe86c5
Fixed cli --simulator not working with latest Xcode simulator name wi…
Jul 3, 2019
d08af44
Updated test case
Jul 3, 2019
c186a8c
Fixed findMatchingSimulator unit test
Jul 3, 2019
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
220 changes: 220 additions & 0 deletions packages/platform-ios/src/commands/runIOS/__tests__/findMatchingSimulator-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,226 @@ describe('findMatchingSimulator', () => {
).toEqual(null);
});

it('should return iPad(name with brackets) simulator if simulator name is in the list', () => {
expect(
findMatchingSimulator(
{
devices: {
'iOS 12.0': [
{
state: 'Shutdown',
availability: '(unavailable, runtime profile not found)',
name: 'iPhone 4s',
udid: 'B9B5E161-416B-43C4-A78F-729CB96CC8C6',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 5',
udid: '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6',
udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6 (Plus)',
udid: '9564ABEE-9EC2-4B4A-B443-D3710929A45A',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6s',
udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPad Pro (9.7-inch)',
udid: 'B2141C1E-86B7-4A10-82A7-4956799526DF',
},
],
'iOS 12.2': [
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6',
udid: '2FF48AE5-CC3B-4C80-8D25-48966A6BE2C0',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6 (Plus)',
udid: '841E33FE-E8A1-4B65-9FF8-6EAA6442A3FC',
},
{
state: 'Booted',
availability: '(available)',
name: 'iPhone 7',
udid: '3A409DC5-5188-42A6-8598-3AA6F34607A5',
},
],
},
},
'iPad Pro (9.7-inch)',
),
).toEqual({
udid: 'B2141C1E-86B7-4A10-82A7-4956799526DF',
name: 'iPad Pro (9.7-inch)',
booted: false,
version: 'iOS 12.0',
});
});

it('should return iPad(name with brackets) simulator if simulator name and specified iOS version is in the list', () => {
expect(
findMatchingSimulator(
{
devices: {
'iOS 12.0': [
{
state: 'Shutdown',
availability: '(unavailable, runtime profile not found)',
name: 'iPhone 4s',
udid: 'B9B5E161-416B-43C4-A78F-729CB96CC8C6',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 5',
udid: '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6',
udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6 (Plus)',
udid: '9564ABEE-9EC2-4B4A-B443-D3710929A45A',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6s',
udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
},
],
'iOS 12.2': [
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6',
udid: '2FF48AE5-CC3B-4C80-8D25-48966A6BE2C0',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6 (Plus)',
udid: '841E33FE-E8A1-4B65-9FF8-6EAA6442A3FC',
},
{
state: 'Booted',
availability: '(available)',
name: 'iPhone 7',
udid: '3A409DC5-5188-42A6-8598-3AA6F34607A5',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPad Pro (9.7-inch)',
udid: 'B2141C1E-86B7-4A10-82A7-4956799526DF',
},
],
},
},
'iPad Pro (9.7-inch) (12.2)',
),
).toEqual({
udid: 'B2141C1E-86B7-4A10-82A7-4956799526DF',
name: 'iPad Pro (9.7-inch)',
booted: false,
version: 'iOS 12.2',
});
});

it('should return null if the version is specified and no iPad device with the exact version exists', () => {
expect(
findMatchingSimulator(
{
devices: {
'iOS 12.0': [
{
state: 'Shutdown',
availability: '(unavailable, runtime profile not found)',
name: 'iPhone 4s',
udid: 'B9B5E161-416B-43C4-A78F-729CB96CC8C6',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 5',
udid: '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6',
udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6 (Plus)',
udid: '9564ABEE-9EC2-4B4A-B443-D3710929A45A',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6s',
udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
},
],
'iOS 12.2': [
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6',
udid: '2FF48AE5-CC3B-4C80-8D25-48966A6BE2C0',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPhone 6 (Plus)',
udid: '841E33FE-E8A1-4B65-9FF8-6EAA6442A3FC',
},
{
state: 'Booted',
availability: '(available)',
name: 'iPhone 7',
udid: '3A409DC5-5188-42A6-8598-3AA6F34607A5',
},
{
state: 'Shutdown',
availability: '(available)',
name: 'iPad Pro (9.7-inch)',
udid: 'B2141C1E-86B7-4A10-82A7-4956799526DF',
},
],
},
},
'iPad Pro (9.7-inch) (12.0)',
),
).toEqual(null);
});

it('should return AppleTV devices if in the list', () => {
expect(
findMatchingSimulator(
Expand Down
3 changes: 2 additions & 1 deletion packages/platform-ios/src/commands/runIOS/findMatchingSimulator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ function findMatchingSimulator(simulators, simulatorString) {
const devices = simulators.devices;

const parsedSimulatorName = simulatorString
? simulatorString.match(/(.*)? (?:\((.*)?\))?/)
? simulatorString.match(/(.*)? (?:\((\d+\.\d+)?\))$/)
: [];

if (parsedSimulatorName && parsedSimulatorName[2] !== undefined) {
var simulatorVersion = parsedSimulatorName[2];
var simulatorName = parsedSimulatorName[1];
Expand Down