fix: failing tests

Author: rigor789

lib/services/android-plugin-build-service.ts

@@ -181,7 +181,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		const androidSourceDirectories = this.getAndroidSourceDirectories(options.platformsAndroidDirPath);
 		const shortPluginName = getShortPluginName(options.pluginName);
 		const pluginTempDir = path.join(options.tempPluginDirPath, shortPluginName);
-    const pluginSourceFileHashesInfo = await this.getSourceFilesHashes(options.platformsAndroidDirPath, shortPluginName);
+		const pluginSourceFileHashesInfo = await this.getSourceFilesHashes(options.platformsAndroidDirPath, shortPluginName);
 
 		const shouldBuildAar = await this.shouldBuildAar({
 			manifestFilePath,
@@ -190,7 +190,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			pluginSourceDir: options.platformsAndroidDirPath,
 			shortPluginName,
 			fileHashesInfo: pluginSourceFileHashesInfo
-    });
+		});
 
 		if (shouldBuildAar) {
 			this.cleanPluginDir(pluginTempDir);
@@ -308,11 +308,11 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			const platformData = this.$platformsDataService.getPlatformData(this.$devicePlatformsConstants.Android, projectData);
 			const projectRuntimeVersion = platformData.platformProjectService.getFrameworkVersion(projectData);
 			this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from runtime v${projectRuntimeVersion}`);
-    }
-    
-    const runtimePackage = this.$projectDataService.getRuntimePackage(projectDir, PlatformTypes.android);
+		}
+
 
 		if (!runtimeGradleVersions) {
+			const runtimePackage = this.$projectDataService.getRuntimePackage(projectDir, PlatformTypes.android);
 			const latestRuntimeVersion = await this.getLatestRuntimeVersion(runtimePackage);
 			runtimeGradleVersions = await this.getGradleVersions(latestRuntimeVersion, runtimePackage);
 			this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from the latest runtime v${latestRuntimeVersion}`);

lib/services/pacote-service.ts

@@ -59,11 +59,11 @@ export class PacoteService implements IPacoteService {
 			});
 
 			this.$logger.trace(`Creating extract tar stream with options: ${JSON.stringify(extractOptions, null, 2)}`);
-      const destination = tar.x(extractOptions);
-      // Initiate the source
-      const sourceStream = new PassThrough();
-      sourceStream.end(source);
-      sourceStream.pipe(destination);
+			const destination = tar.x(extractOptions);
+			// Initiate the source
+			const sourceStream = new PassThrough();
+			sourceStream.end(source);
+			sourceStream.pipe(destination);
 
 			destination.on("error", (err: Error) => {
 				this.$logger.trace(`Error in destination while trying to extract stream from ${packageName}. Error is ${err}`);

test/controllers/update-controller.ts

@@ -55,7 +55,7 @@ function createTestInjector(
 	testInjector.register("packageInstallationManager", stubs.PackageInstallationManagerStub);
 	testInjector.register("platformsDataService", stubs.NativeProjectDataStub);
 	testInjector.register("pacoteService", stubs.PacoteServiceStub);
-	testInjector.register("projectDataService", stubs.ProjectDataService);
+	testInjector.register("projectDataService", stubs.ProjectDataServiceStub);
 	testInjector.register("updateController", UpdateController);
 
 	return testInjector;
@@ -200,4 +200,4 @@ describe("update controller method tests", () => {
 	// 		});
 	// 	});
 	// }
-});
+});

test/ios-project-service.ts

@@ -31,7 +31,7 @@ import { YarnPackageManager } from "../lib/yarn-package-manager";
 import { assert } from "chai";
 import { SettingsService } from "../lib/common/test/unit-tests/stubs";
 import { BUILD_XCCONFIG_FILE_NAME } from "../lib/constants";
-import { ProjectDataStub, TempServiceStub, ProjectDataService } from "./stubs";
+import { ProjectDataStub, TempServiceStub, ProjectDataServiceStub } from "./stubs";
 import { xcode } from "../lib/node/xcode";
 import temp = require("temp");
 import { CocoaPodsPlatformManager } from "../lib/services/cocoapods-platform-manager";
@@ -97,7 +97,7 @@ function createTestInjector(projectPath: string, projectName: string, xCode?: IX
 	testInjector.register("projectHelper", {});
 	testInjector.register("xcodeSelectService", {});
 	testInjector.register("staticConfig", ConfigLib.StaticConfig);
-	testInjector.register("projectDataService", ProjectDataService);
+	testInjector.register("projectDataService", ProjectDataServiceStub);
 	testInjector.register("prompter", {});
 	testInjector.register("devicePlatformsConstants", { iOS: "iOS" });
 	testInjector.register("devicesService", DevicesService);

test/platform-commands.ts

@@ -122,7 +122,7 @@ function createTestInjector() {
 	testInjector.register('projectData', stubs.ProjectDataStub);
 	testInjector.register('platformsDataService', PlatformsDataService);
 	testInjector.register('devicesService', {});
-	testInjector.register('projectDataService', stubs.ProjectDataService);
+	testInjector.register('projectDataService', stubs.ProjectDataServiceStub);
 	testInjector.register('prompter', {});
 	testInjector.register('sysInfo', {});
 	testInjector.register('commands-service', CommandsServiceLib.CommandsService);

test/services/android-plugin-build-service.ts

@@ -119,7 +119,8 @@ describe('androidPluginBuildService', () => {
 			view: async (packageName: string, config: any): Promise<any> => {
 				let result: any = null;
 				if (config && config.gradle) {
-					const packageVersion = packageName.split("@")[1];
+					const packageNameParts = packageName.split("@");
+					const packageVersion = packageNameParts[packageNameParts.length - 1];
 					switch (packageVersion) {
 						case "1.0.0":
 							result = {
@@ -316,7 +317,7 @@ dependencies {
 			assert.isTrue(spawnFromEventCalled);
 		});
 
-		it.skip('builds aar with the specified runtime gradle versions when the project runtime has gradle versions', async () => {
+		it('builds aar with the specified runtime gradle versions when the project runtime has gradle versions', async () => {
 			const expectedGradleVersion = "4.4.4";
 			const expectedAndroidVersion = "5.5.5";
 			const config: IPluginBuildOptions = setup({

test/services/android-project-service.ts

@@ -18,7 +18,7 @@ const createTestInjector = (): IInjector => {
 	testInjector.register("hooksService", stubs.HooksServiceStub);
 	testInjector.register("childProcess", stubs.ChildProcessStub);
 	testInjector.register("hostInfo", {});
-	testInjector.register("projectDataService", stubs.ProjectDataService);
+	testInjector.register("projectDataService", stubs.ProjectDataServiceStub);
 	testInjector.register("pluginVariablesService", {});
 	testInjector.register("fs", stubs.FileSystemStub);
 	testInjector.register("injector", testInjector);

test/services/pacote-service.ts

@@ -90,24 +90,33 @@ class MockStream extends EventEmitter {
 	public pipe(destination: any, options?: { end?: boolean; }): any {
 		// Nothing to do here, just mock the method.
 	}
+	public end(): any {
+		//
+	}
+}
+
+class MockBuffer {
+	constructor() {
+		return Buffer.from([]);
+	}
 }
 
-describe.skip("pacoteService", () => {
+describe("pacoteService", () => {
 	const manifestResult: any = {};
 	const manifestOptions: IPacoteManifestOptions = { fullMetadata: true };
 	let sandboxInstance: sinon.SinonSandbox = null;
 	let manifestStub: sinon.SinonStub = null;
 	let tarballStreamStub: sinon.SinonStub = null;
 	let tarXStub: sinon.SinonStub = null;
-	let tarballSourceStream: MockStream = null;
+	let tarballSourceBuffer: MockBuffer = null;
 	let tarExtractDestinationStream: MockStream = null;
 
 	beforeEach(() => {
 		sandboxInstance = sinon.createSandbox();
 		manifestStub = sandboxInstance.stub(pacote, "manifest").returns(Promise.resolve(manifestResult));
-		tarballSourceStream = new MockStream();
-		tarballStreamStub = sandboxInstance.stub(pacote, "tarball").returns(Promise.resolve(<any>tarballSourceStream));
-    tarExtractDestinationStream = new MockStream();
+		tarballSourceBuffer = new MockBuffer();
+		tarballStreamStub = sandboxInstance.stub(pacote, "tarball").returns(Promise.resolve(<any>tarballSourceBuffer));
+		tarExtractDestinationStream = new MockStream();
 		tarXStub = sandboxInstance.stub(tar, "x").returns(<any>tarExtractDestinationStream);
 	});
 
@@ -205,13 +214,11 @@ describe.skip("pacoteService", () => {
 	});
 
 	describe("extractPackage", () => {
-		it("fails with correct error when pacote.tarball.stream raises error event", async () => {
+		it("fails with correct error when pacote.tarball raises error event", async () => {
 			const pacoteService = setupTest();
 
+			tarballStreamStub.returns(Promise.reject(new Error(errorMessage)));
 			const pacoteExtractPackagePromise = pacoteService.extractPackage(packageName, destinationDir);
-			setImmediate(() => {
-				tarballSourceStream.emit("error", new Error(errorMessage));
-			});
 
 			await assert.isRejected(pacoteExtractPackagePromise, errorMessage);
 		});

test/stubs.ts

@@ -632,7 +632,7 @@ export class NativeProjectDataStub extends EventEmitter implements IPlatformsDat
 	}
 }
 
-export class ProjectDataService implements IProjectDataService {
+export class ProjectDataServiceStub implements IProjectDataService {
 	getNSValue(propertyName: string): any {
 		return {};
 	}
@@ -1042,7 +1042,7 @@ export class InjectorStub extends Yok implements IInjector {
 		this.register("config", {});
 		this.register("staticConfig", {});
 		this.register("hooksService", HooksServiceStub);
-		this.register('projectDataService', ProjectDataService);
+		this.register('projectDataService', ProjectDataServiceStub);
 		this.register('devicePlatformsConstants', DevicePlatformsConstants);
 		this.register("androidResourcesMigrationService", AndroidResourcesMigrationServiceStub);
 		this.register("commandsService", CommandsService);

test/tns-appstore-upload.ts

@@ -1,5 +1,5 @@
 import { PublishIOS } from "../lib/commands/appstore-upload";
-import { PrompterStub, LoggerStub, ProjectDataStub, ProjectDataService } from "./stubs";
+import { PrompterStub, LoggerStub, ProjectDataStub, ProjectDataServiceStub } from "./stubs";
 import * as chai from "chai";
 import * as yok from "../lib/common/yok";
 import { PrepareNativePlatformService } from "../lib/services/platform/prepare-native-platform-service";
@@ -99,7 +99,7 @@ class AppStore {
 			}
 		}
 
-		this.injector.register("projectDataService", ProjectDataService);
+		this.injector.register("projectDataService", ProjectDataServiceStub);
 	}
 
 	assert() {