Skip to content

fix: fix the unit tests execution with istanbul #4555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fatme merged 1 commit into from
Apr 22, 2019
Merged

fix: fix the unit tests execution with istanbul #4555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/services/android/gradle-command-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ export class GradleCommandService implements IGradleCommandService {
) { }

public async executeCommand(gradleArgs: string[], options: IGradleCommandOptions): Promise<ISpawnResult> {
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);

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<ISpawnResult> {
try {
const result = await this.$childProcess.spawnFromEvent(gradleExecutable, gradleArgs, "close", childProcessOptions, spawnOptions);

Expand Down
7 changes: 4 additions & 3 deletions test/services/android/gradle-build-args-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ function createTestInjector(): IInjector {
injector.register("androidToolsInfo", {
getToolsInfo: () => ({
compileSdkVersion: 28,
targetSdkVersion: 26,
buildToolsVersion: "my-build-tools-version",
generateTypings: true
})
Expand Down Expand Up @@ -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"
Expand Down