Fixed Pacote test, broken path.resolve stub breaking things

Author: Nathanael Anderson

lib/services/pacote-service.ts

@@ -27,8 +27,6 @@ export class PacoteService implements IPacoteService {
 		this.$logger.trace(`Calling pacoteService.manifest for packageName: '${packageName}' and options: ${options}`);
 		const manifestOptions: IPacoteBaseOptions = await this.getPacoteBaseOptions();
 
-		// Add NPM Configuration to our Manifest options
-		_.extend(manifestOptions, this.npmConfig);
 
 		if (options) {
 			_.extend(manifestOptions, options);
@@ -79,7 +77,9 @@ export class PacoteService implements IPacoteService {
 	private async getPacoteBaseOptions(): Promise<IPacoteBaseOptions> {
 		// In case `tns create myapp --template https://github.com/NativeScript/template-hello-world.git` command is executed, pacote module throws an error if cache option is not provided.
 		const cachePath = await this.$packageManager.getCachePath();
-		const pacoteOptions = { cache: cachePath };
+
+		// Add NPM Configuration to our Manifest options
+		const pacoteOptions = _.extend( this.npmConfig, {cache: cachePath });
 		const proxySettings = await this.$proxyService.getCache();
 		if (proxySettings) {
 			_.extend(pacoteOptions, proxySettings);

test/services/pacote-service.ts

@@ -10,11 +10,11 @@ const pacote = require("pacote");
 const tar = require("tar");
 const path = require("path");
 
-const npmCachePath = "npmCachePath";
+const defaultPacoteOpts: IPacoteBaseOptions = createPacoteOptions({});
+const npmCachePath = defaultPacoteOpts['cache'];
 const packageName = "testPackage";
 const fullPath = `/Users/username/${packageName}`;
 const destinationDir = "destinationDir";
-const defaultPacoteOpts: IPacoteBaseOptions = createPacoteOptions({ cache: npmCachePath });
 const errorMessage = "error message";
 const proxySettings: IProxySettings = {
 	hostname: "hostname",
@@ -38,11 +38,17 @@ interface ITestCase extends ITestSetup {
 	expectedArgs: any[];
 }
 
-function createPacoteOptions(options: Object): Object {
+function createPacoteOptions(source: Object): Object {
+		let options: { [index: string]: any } = {};
 		npmconfig.read().forEach((value: any, key: string) => {
 			// replace env ${VARS} in strings with the process.env value
 			options[key] = typeof value !== 'string' ? value :  value.replace(/\${([^}]+)}/, (_, envVar) => process.env[envVar] );
 		});
+
+		// Copy any original source keys over our defaults
+		for (let key in source) {
+		    options[key] = source[key];
+		}
 	return options;
 }
 
@@ -113,8 +119,15 @@ describe("pacoteService", () => {
 	const setupTest = (opts?: ITestSetup): IPacoteService => {
 		opts = opts || {};
 		const testInjector = createTestInjector(opts);
+
 		if (opts.isLocalPackage) {
-			sandboxInstance.stub(path, "resolve").withArgs(packageName).returns(fullPath);
+		    const oldPath = path.resolve;
+		    sandboxInstance.stub(path, "resolve").callsFake((value:string) => {
+			if (value === packageName) {
+			    return fullPath;
+			}
+			return oldPath(value);
+		    });
 		}
 
 		return testInjector.resolve<IPacoteService>("pacoteService");
@@ -126,7 +139,7 @@ describe("pacoteService", () => {
 			const testData: ITestCase[] = [
 				{
 					name: "with 'cache' only when no opts are passed",
-					expectedArgs: [packageName, defaultPacoteOpts]
+					expectedArgs: [packageName, _.extend({}, defaultPacoteOpts)]
 				},
 				{
 					name: "with 'cache' and passed options",
@@ -147,7 +160,7 @@ describe("pacoteService", () => {
 				{
 					name: "with full path to file when it is local one",
 					isLocalPackage: true,
-					expectedArgs: [fullPath, defaultPacoteOpts]
+					expectedArgs: [fullPath, _.extend({}, defaultPacoteOpts)]
 				},
 				{
 					name: "with full path to file, 'cache' and passed options when local path is passed",