Fix check for ios simulator

When we check if there is running simulator we use ps cax but if the simulator is killed for a short period of time after that there is a process listed when using ps cax and we decide that there is a running simulator and then we try to use it but ios-sim-portable returns null. We should check if the simulator returned from ios-sim-portable is not null or undefined in order to continue to work with it.

Author: TsvetanMilanov

mobile/mobile-core/ios-simulator-discovery.ts

@@ -18,9 +18,9 @@ export class IOSSimulatorDiscovery extends DeviceDiscovery {
 
 	public checkForDevices(future?: IFuture<void>): IFuture<void> {
 		if (this.$hostInfo.isDarwin) {
-			if (this.isSimulatorRunning().wait()) {
-				let currentSimulator = this.$iOSSimResolver.iOSSim.getRunningSimulator();
+			let currentSimulator = this.$iOSSimResolver.iOSSim.getRunningSimulator();
 
+			if (currentSimulator) {
 				if (!this.cachedSimulator) {
 					this.createAndAddDevice(currentSimulator);
 				} else if (this.cachedSimulator.id !== currentSimulator.id) {
@@ -41,20 +41,10 @@ export class IOSSimulatorDiscovery extends DeviceDiscovery {
 		return future || Future.fromResult();
 	}
 
-	private isSimulatorRunning(): IFuture<boolean> {
-		return (() => {
-			try {
-				let output = this.$childProcess.exec("ps cax | grep launchd_sim").wait();
-				return output.indexOf('launchd_sim') !== -1;
-			} catch(e) {
-				return false;
-			}
-		}).future<boolean>()();
-	}
-
 	private createAndAddDevice(simulator: Mobile.IiSimDevice): void {
 		this.cachedSimulator = _.cloneDeep(simulator);
-		this.addDevice(this.$injector.resolve(IOSSimulator, {simulator: this.cachedSimulator}));
+		this.addDevice(this.$injector.resolve(IOSSimulator, { simulator: this.cachedSimulator }));
 	}
 }
+
 $injector.register("iOSSimulatorDiscovery", IOSSimulatorDiscovery);