diff --git a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js index 1729177df51334..645883412b007c 100644 --- a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js +++ b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js @@ -65,6 +65,58 @@ describe('findMatchingSimulator', () => { }); }); + it('should find simulator with new xcrun format', () => { + expect( + findMatchingSimulator( + { + devices: { + 'iOS 12.1': [ + { + state: 'Shutdown', + isAvailable: 'YES', + name: 'iPhone 6s', + udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508', + }, + { + state: 'Shutdown', + isAvailable: 'YES', + name: 'iPhone 6', + udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C', + }, + { + state: 'Shutdown', + isAvailable: 'YES', + name: 'iPhone XS Max', + udid: 'B9B5E161-416B-43C4-A78F-729CB96CC8C6', + availabilityError: '', + }, + { + state: 'Shutdown', + isAvailable: 'YES', + name: 'iPad Air', + udid: '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB', + availabilityError: '', + }, + { + state: 'Shutdown', + isAvailable: 'YES', + name: 'iPad (5th generation)', + udid: '9564ABEE-9EC2-4B4A-B443-D3710929A45A', + availabilityError: '', + }, + ], + }, + }, + 'iPhone 6', + ), + ).toEqual({ + udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C', + name: 'iPhone 6', + booted: false, + version: 'iOS 12.1', + }); + }); + it('should return null if no simulators available', () => { expect( findMatchingSimulator( diff --git a/local-cli/runIOS/findMatchingSimulator.js b/local-cli/runIOS/findMatchingSimulator.js index c80102e6d7767b..f336f96a6c0f8f 100644 --- a/local-cli/runIOS/findMatchingSimulator.js +++ b/local-cli/runIOS/findMatchingSimulator.js @@ -34,7 +34,10 @@ function findMatchingSimulator(simulators, simulatorName) { for (let i in devices[version]) { let simulator = devices[version][i]; // Skipping non-available simulator - if (simulator.availability !== '(available)') { + if ( + simulator.availability !== '(available)' && + simulator.isAvailable !== 'YES' + ) { continue; } let booted = simulator.state === 'Booted';