Merge pull request #1077 from telerik/vladimirov/fix-ios-logs-deploy

rosen-vladimirov · web-flow · commit d5b83190946b · 2018-03-28T10:12:40.000+03:00
fix(deviceLogs): iOS device logs are not shown when deployOnDevices is used
diff --git a/definitions/mobile.d.ts b/definitions/mobile.d.ts
@@ -270,7 +270,6 @@ declare module Mobile {
 		startApplication(appData: IApplicationData): Promise<void>;
 		stopApplication(appData: IApplicationData): Promise<void>;
 		restartApplication(appData: IApplicationData): Promise<void>;
-		canStartApplication(): boolean;
 		checkForApplicationUpdates(): Promise<void>;
 		isLiveSyncSupported(appIdentifier: string): Promise<boolean>;
 		getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo>;
diff --git a/mobile/android/android-application-manager.ts b/mobile/android/android-application-manager.ts
@@ -92,10 +92,6 @@ export class AndroidApplicationManager extends ApplicationManagerBase {
 		return Promise.resolve(null);
 	}
 
-	public canStartApplication(): boolean {
-		return true;
-	}
-
 	public async isLiveSyncSupported(appIdentifier: string): Promise<boolean> {
 		const liveSyncVersion = await this.adb.sendBroadcastToDevice(LiveSyncConstants.CHECK_LIVESYNC_INTENT_NAME, { "app-id": appIdentifier });
 		return liveSyncVersion === LiveSyncConstants.VERSION_2 || liveSyncVersion === LiveSyncConstants.VERSION_3;
diff --git a/mobile/application-manager-base.ts b/mobile/application-manager-base.ts
@@ -70,11 +70,9 @@ export abstract class ApplicationManagerBase extends EventEmitter implements Mob
 
 	public async tryStartApplication(appData: Mobile.IApplicationData): Promise<void> {
 		try {
-			if (this.canStartApplication()) {
-				await this.startApplication(appData);
-			}
+			await this.startApplication(appData);
 		} catch (err) {
-			this.$logger.trace(`Unable to start application ${appData.appId}. Error is: ${err.message}`);
+			this.$logger.trace(`Unable to start application ${appData.appId} with name ${appData.projectName}. Error is: ${err.message}`);
 		}
 	}
 
@@ -86,7 +84,6 @@ export abstract class ApplicationManagerBase extends EventEmitter implements Mob
 	public abstract async stopApplication(appData: Mobile.IApplicationData): Promise<void>;
 	public abstract async getInstalledApplications(): Promise<string[]>;
 	public abstract async getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo>;
-	public abstract canStartApplication(): boolean;
 	public abstract async getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]>;
 	public abstract async getDebuggableAppViews(appIdentifiers: string[]): Promise<IDictionary<Mobile.IDebugWebViewInfo[]>>;
 
diff --git a/mobile/ios/device/ios-application-manager.ts b/mobile/ios/device/ios-application-manager.ts
@@ -11,8 +11,6 @@ export class IOSApplicationManager extends ApplicationManagerBase {
 		private device: Mobile.IDevice,
 		private $errors: IErrors,
 		private $iOSNotificationService: IiOSNotificationService,
-		private $hostInfo: IHostInfo,
-		private $staticConfig: Config.IStaticConfig,
 		private $iosDeviceOperations: IIOSDeviceOperations,
 		private $options: ICommonOptions,
 		private $deviceLogProvider: Mobile.IDeviceLogProvider) {
@@ -102,6 +100,7 @@ export class IOSApplicationManager extends ApplicationManagerBase {
 
 	public async restartApplication(appData: Mobile.IApplicationData): Promise<void> {
 		try {
+			this.$deviceLogProvider.setProjectNameForDevice(this.device.deviceInfo.identifier, appData.projectName);
 			await this.stopApplication(appData);
 			await this.runApplicationCore(appData);
 		} catch (err) {
@@ -123,10 +122,6 @@ export class IOSApplicationManager extends ApplicationManagerBase {
 		await this.device.openDeviceLogStream();
 	}
 
-	public canStartApplication(): boolean {
-		return this.$hostInfo.isDarwin || (this.$hostInfo.isWindows && this.$staticConfig.enableDeviceRunCommandOnWindows);
-	}
-
 	public getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]> {
 		// Implement when we can find debuggable applications for iOS.
 		return Promise.resolve([]);
diff --git a/mobile/ios/simulator/ios-simulator-application-manager.ts b/mobile/ios/simulator/ios-simulator-application-manager.ts
@@ -54,10 +54,6 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 		return this.iosSim.stopApplication(this.identifier, appData.appId, appData.projectName);
 	}
 
-	public canStartApplication(): boolean {
-		return true;
-	}
-
 	public async getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo> {
 		let result: Mobile.IApplicationInfo = null;
 		const plistContent = await this.getParsedPlistContent(applicationIdentifier);
diff --git a/services/livesync-service-base.ts b/services/livesync-service-base.ts
@@ -183,7 +183,7 @@ class LiveSyncServiceBase implements ILiveSyncServiceBase {
 						shouldRefreshApplication = false;
 					}
 
-					if (device.applicationManager.canStartApplication() && !shouldRefreshApplication) {
+					if (!shouldRefreshApplication) {
 						await device.applicationManager.startApplication({ appId: appIdentifier, projectName: "" });
 					}
 					wasInstalled = false;
diff --git a/test/unit-tests/mobile/application-manager-base.ts b/test/unit-tests/mobile/application-manager-base.ts
@@ -40,10 +40,6 @@ class ApplicationManager extends ApplicationManagerBase {
 		return null;
 	}
 
-	public canStartApplication(): boolean {
-		return true;
-	}
-
 	public async getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]> {
 		return currentlyAvailableAppsForDebugging;
 	}
@@ -640,10 +636,9 @@ describe("ApplicationManagerBase", () => {
 	});
 
 	describe("tryStartApplication", () => {
-		it("calls startApplication, when canStartApplication returns true", async () => {
+		it("calls startApplication", async () => {
 			let passedApplicationData: Mobile.IApplicationData = null;
 
-			applicationManager.canStartApplication = () => true;
 			applicationManager.startApplication = (appData: Mobile.IApplicationData) => {
 				passedApplicationData = appData;
 				return Promise.resolve();
@@ -658,18 +653,6 @@ describe("ApplicationManagerBase", () => {
 
 		});
 
-		it("does not call startApplication, when canStartApplication returns false", async () => {
-			let isStartApplicationCalled = false;
-			applicationManager.canStartApplication = () => false;
-			applicationManager.startApplication = (appData: Mobile.IApplicationData) => {
-				isStartApplicationCalled = true;
-				return Promise.resolve();
-			};
-
-			await applicationManager.tryStartApplication(applicationData);
-			assert.isFalse(isStartApplicationCalled, "startApplication must not be called when canStartApplication returns false.");
-		});
-
 		describe("does not throw Error", () => {
 			const error = new Error("Throw!");
 			let isStartApplicationCalled = false;
@@ -696,16 +679,7 @@ describe("ApplicationManagerBase", () => {
 				assert.isTrue(logger.traceOutput.indexOf("Unable to start application") !== -1, "'Unable to start application' must be shown in trace output.");
 			};
 
-			it("when canStartApplication throws error", async () => {
-				applicationManager.canStartApplication = (): boolean => {
-					throw error;
-				};
-				applicationManager.isApplicationInstalled = (appId: string) => Promise.resolve(true);
-				await assertDoesNotThrow();
-			});
-
 			it("when startApplications throws", async () => {
-				applicationManager.canStartApplication = () => true;
 				applicationManager.isApplicationInstalled = (appId: string) => Promise.resolve(true);
 				await assertDoesNotThrow({ shouldStartApplicatinThrow: true });
 			});
diff --git a/test/unit-tests/mobile/devices-service.ts b/test/unit-tests/mobile/devices-service.ts
@@ -78,7 +78,6 @@ const iOSSimulator = {
 	},
 	applicationManager: {
 		getInstalledApplications: () => Promise.resolve(["com.telerik.unitTest1", "com.telerik.unitTest2"]),
-		canStartApplication: () => true,
 		startApplication: (packageName: string, framework: string) => Promise.resolve(),
 		tryStartApplication: (packageName: string, framework: string) => Promise.resolve(),
 		reinstallApplication: (packageName: string, packageFile: string) => Promise.resolve(),
@@ -218,7 +217,6 @@ describe("devicesService", () => {
 		},
 		applicationManager: {
 			getInstalledApplications: () => Promise.resolve(["com.telerik.unitTest1", "com.telerik.unitTest2"]),
-			canStartApplication: () => true,
 			startApplication: (appData: Mobile.IApplicationData) => Promise.resolve(),
 			tryStartApplication: (appData: Mobile.IApplicationData) => Promise.resolve(),
 			reinstallApplication: (packageName: string, packageFile: string) => Promise.resolve(),
@@ -238,7 +236,6 @@ describe("devicesService", () => {
 		},
 		applicationManager: {
 			getInstalledApplications: () => Promise.resolve(["com.telerik.unitTest1", "com.telerik.unitTest2", "com.telerik.unitTest3"]),
-			canStartApplication: () => true,
 			startApplication: (appData: Mobile.IApplicationData) => Promise.resolve(),
 			tryStartApplication: (appData: Mobile.IApplicationData) => Promise.resolve(),
 			reinstallApplication: (packageName: string, packageFile: string) => Promise.resolve(),
@@ -935,18 +932,6 @@ describe("devicesService", () => {
 			});
 		});
 
-		it("does not call startApplication when canStartApplication returns false", async () => {
-			iOSDevice.applicationManager.canStartApplication = () => false;
-			iOSDevice.applicationManager.startApplication = (): Promise<void> => {
-				throw new Error("Start application must not be called for iOSDevice when canStartApplication returns false.");
-			};
-
-			const results = devicesService.deployOnDevices([androidDevice.deviceInfo.identifier, iOSDevice.deviceInfo.identifier], "path", "packageName", "cordova");
-			assert.isTrue(results.length > 0);
-			const deployOnDevicesResults = await Promise.all(results);
-			assert.deepEqual(deployOnDevicesResults, [undefined, undefined]);
-		});
-
 		it("throws error when invalid identifier is passed", async () => {
 			const results = devicesService.deployOnDevices(["invalidDeviceId", iOSDevice.deviceInfo.identifier], "path", "packageName", "cordova");
 			const expectedErrorMessage = getErrorMessage(testInjector, "NotFoundDeviceByIdentifierErrorMessageWithIdentifier", "invalidDeviceId");

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ class LiveSyncServiceBase implements ILiveSyncServiceBase {`
`183`	`183`	`shouldRefreshApplication = false;`
`184`	`184`	`}`
`185`	`185`
`186`		`- if (device.applicationManager.canStartApplication() && !shouldRefreshApplication) {`
	`186`	`+ if (!shouldRefreshApplication) {`
`187`	`187`	`await device.applicationManager.startApplication({ appId: appIdentifier, projectName: "" });`
`188`	`188`	`}`
`189`	`189`	`wasInstalled = false;`