Skip to content

Commit d7ec0dc

Browse files
Fatme HavaluovaFatme Havaluova
authored andcommitted
Fix unit tests
1 parent 1032a7b commit d7ec0dc

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

lib/services/platform-service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,12 +400,12 @@ export class PlatformService implements IPlatformService {
400400
return (() => {
401401
if (!packageFile) {
402402
if (this.$devicesService.isiOSSimulator(device)) {
403-
this.buildPlatform(platform, buildConfig).wait();
403+
this.buildForDeploy(platform, buildConfig).wait();
404404
packageFile = this.getLatestApplicationPackageForEmulator(platformData).wait().packageName;
405405
} else {
406406
buildConfig = buildConfig || {};
407407
buildConfig.buildForDevice = true;
408-
this.buildPlatform(platform, buildConfig).wait();
408+
this.buildForDeploy(platform, buildConfig).wait();
409409
packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
410410
}
411411
}

test/ios-project-service.ts

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,31 @@ import * as iOSProjectServiceLib from "../lib/services/ios-project-service";
1212
import * as LoggerLib from "../lib/common/logger";
1313
import * as OptionsLib from "../lib/options";
1414
import * as yok from "../lib/common/yok";
15+
import {DevicesService} from "../lib/common/mobile/mobile-core/devices-service";
16+
import {MobileHelper} from "../lib/common/mobile/mobile-helper";
17+
import {Messages} from "../lib/common/messages/messages";
18+
import {MobilePlatformsCapabilities} from "../lib/mobile-platforms-capabilities";
19+
import {DeviceLogProvider} from "../lib/common/mobile/device-log-provider";
20+
import {LogFilter} from "../lib/common/mobile/log-filter";
21+
import {LoggingLevels} from "../lib/common/mobile/logging-levels";
22+
import {DeviceDiscovery} from "../lib/common/mobile/mobile-core/device-discovery";
23+
import {IOSDeviceDiscovery} from "../lib/common/mobile/mobile-core/ios-device-discovery";
24+
import {AndroidDeviceDiscovery} from "../lib/common/mobile/mobile-core/android-device-discovery";
25+
import {Utils} from "../lib/common/utils";
1526
import { assert } from "chai";
1627
import temp = require("temp");
1728
temp.track();
1829

30+
class IOSSimulatorDiscoveryMock extends DeviceDiscovery {
31+
public startLookingForDevices(): IFuture<void> {
32+
return Future.fromResult();
33+
}
34+
35+
public checkForDevices(): IFuture<void> {
36+
return Future.fromResult();
37+
}
38+
}
39+
1940
function createTestInjector(projectPath: string, projectName: string): IInjector {
2041
let testInjector = new yok.Yok();
2142
testInjector.register("childProcess", ChildProcessLib.ChildProcess);
@@ -39,6 +60,19 @@ function createTestInjector(projectPath: string, projectName: string): IInjector
3960
testInjector.register("projectDataService", {});
4061
testInjector.register("prompter", {});
4162
testInjector.register("devicePlatformsConstants", { iOS: "iOS" });
63+
testInjector.register("devicesService", DevicesService);
64+
testInjector.register("iOSDeviceDiscovery", IOSDeviceDiscovery);
65+
testInjector.register("iOSSimulatorDiscovery", IOSSimulatorDiscoveryMock);
66+
testInjector.register("iOSSimResolver", {});
67+
testInjector.register("androidDeviceDiscovery", AndroidDeviceDiscovery);
68+
testInjector.register("messages", Messages);
69+
testInjector.register("mobileHelper", MobileHelper);
70+
testInjector.register("mobilePlatformsCapabilities", MobilePlatformsCapabilities);
71+
testInjector.register("deviceLogProvider", DeviceLogProvider);
72+
testInjector.register("logFilter", LogFilter);
73+
testInjector.register("loggingLevels", LoggingLevels);
74+
testInjector.register("utils", Utils);
75+
testInjector.register("iTunesValidator", {});
4276
return testInjector;
4377
}
4478

test/stubs.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,9 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
318318
buildProject(projectRoot: string): IFuture<void> {
319319
return Future.fromResult();
320320
}
321+
buildForDeploy(projectRoot: string): IFuture<void> {
322+
return Future.fromResult();
323+
}
321324
isPlatformPrepared(projectRoot: string): IFuture<boolean> {
322325
return Future.fromResult(false);
323326
}

0 commit comments

Comments
 (0)