Merge pull request #107 from telerik/vladimirov/fix-run-device

fix: launchApplication fails when device identifier is passed

Author: rosen-vladimirov

lib/iphone-simulator-xcode-simctl.ts

@@ -45,11 +45,7 @@ export class XCodeSimctlSimulator extends IPhoneSimulatorNameGetter implements I
 	}
 
 	public run(applicationPath: string, applicationIdentifier: string, options: IOptions): string {
-		let device = this.getDeviceToRun(options);
-		let currentBootedDevice = _.find(this.getDevices(), device => this.isDeviceBooted(device));
-		if (currentBootedDevice && (currentBootedDevice.name.toLowerCase() !== device.name.toLowerCase() || currentBootedDevice.runtimeVersion !== device.runtimeVersion)) {
-			this.killSimulator();
-		}
+		const device = this.getDeviceToRun(options);
 
 		this.startSimulator(options, device);
 		if (!options.skipInstall) {
@@ -210,7 +206,7 @@ export class XCodeSimctlSimulator extends IPhoneSimulatorNameGetter implements I
 		if (!this.isDeviceBooted(device)) {
 			const isSimulatorAppRunning = this.isSimulatorAppRunning();
 			const haveBootedDevices = this.haveBootedDevices();
-				
+
 			if (isSimulatorAppRunning) {
 				// In case user closes simulator window but simulator app is still alive
 				if (!haveBootedDevices) {

lib/iphone-simulator.ts

@@ -24,9 +24,9 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		}
 
 		if (options.device) {
-			let deviceNames = _.unique(_.map(this.simulator.getDevices(), (device: IDevice) => device.name));
-			if (!_.contains(deviceNames, options.device)) {
-				errors.fail(`Unable to find device ${options.device}. The valid device names are ${deviceNames.join(", ")}`);
+			const hasSuchDevice = _.find(this.simulator.getDevices(), device => device.name === options.device || device.id === options.device);
+			if (!hasSuchDevice) {
+				errors.fail(`Unable to find device ${options.device}.`);
 			}
 		}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ios-sim-portable",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "description": "",
   "main": "./lib/ios-sim.js",
   "scripts": {