From 535e296a2b59e94a49fb92c4035ae48df7531b85 Mon Sep 17 00:00:00 2001 From: fatme Date: Mon, 22 Apr 2019 11:45:37 +0300 Subject: [PATCH] fix: fix the unit tests execution with istanbul --- lib/services/android/gradle-command-service.ts | 6 +++--- test/services/android/gradle-build-args-service.ts | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/services/android/gradle-command-service.ts b/lib/services/android/gradle-command-service.ts index c829ac217f..07e398450b 100644 --- a/lib/services/android/gradle-command-service.ts +++ b/lib/services/android/gradle-command-service.ts @@ -7,10 +7,10 @@ export class GradleCommandService implements IGradleCommandService { ) { } public async executeCommand(gradleArgs: string[], options: IGradleCommandOptions): Promise { - const { message, cwd, stdio = "inherit", spawnOptions } = options; + const { message, cwd, stdio, spawnOptions } = options; this.$logger.info(message); - const childProcessOptions = { cwd, stdio }; + const childProcessOptions = { cwd, stdio: stdio || "inherit" }; const gradleExecutable = this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew"; const result = await this.executeCommandSafe(gradleExecutable, gradleArgs, childProcessOptions, spawnOptions); @@ -18,7 +18,7 @@ export class GradleCommandService implements IGradleCommandService { return result; } - private async executeCommandSafe(gradleExecutable: string, gradleArgs: string[], childProcessOptions: { cwd: string, stdio: string }, spawnOptions: ISpawnFromEventOptions) { + private async executeCommandSafe(gradleExecutable: string, gradleArgs: string[], childProcessOptions: { cwd: string, stdio: string }, spawnOptions: ISpawnFromEventOptions): Promise { try { const result = await this.$childProcess.spawnFromEvent(gradleExecutable, gradleArgs, "close", childProcessOptions, spawnOptions); diff --git a/test/services/android/gradle-build-args-service.ts b/test/services/android/gradle-build-args-service.ts index d112872936..0a93c8ebdf 100644 --- a/test/services/android/gradle-build-args-service.ts +++ b/test/services/android/gradle-build-args-service.ts @@ -7,6 +7,7 @@ function createTestInjector(): IInjector { injector.register("androidToolsInfo", { getToolsInfo: () => ({ compileSdkVersion: 28, + targetSdkVersion: 26, buildToolsVersion: "my-build-tools-version", generateTypings: true }) @@ -36,13 +37,13 @@ function executeTests(testCases: any[], testFunction: (gradleBuildArgsService: I const expectedInfoLoggingArgs = ["--quiet"]; const expectedTraceLoggingArgs = ["--stacktrace", "--debug"]; -const expectedDebugBuildArgs = ["-PcompileSdk=android-28", "-PbuildToolsVersion=my-build-tools-version", "-PgenerateTypings=true"]; -const expectedReleaseBuildArgs = expectedDebugBuildArgs.concat(["-Prelease", "-PksPath=/Users/havaluova/Work/nativescript-cli/keyStorePath", +const expectedDebugBuildArgs = ["-PcompileSdk=android-28", "-PtargetSdk=26", "-PbuildToolsVersion=my-build-tools-version", "-PgenerateTypings=true"]; +const expectedReleaseBuildArgs = expectedDebugBuildArgs.concat(["-Prelease", "-PksPath=/my/key/store/path", "-Palias=keyStoreAlias", "-Ppassword=keyStoreAliasPassword", "-PksPassword=keyStorePassword"]); const releaseBuildConfig = { release: true, - keyStorePath: "keyStorePath", + keyStorePath: "/my/key/store/path", keyStoreAlias: "keyStoreAlias", keyStoreAliasPassword: "keyStoreAliasPassword", keyStorePassword: "keyStorePassword"