From c0b5a163ff0bab4c8d2b4968216c9687300cb4bd Mon Sep 17 00:00:00 2001 From: wnvko Date: Thu, 12 Apr 2018 11:36:42 +0300 Subject: [PATCH 1/2] fix: in installPackages method enable skipAnalytic in order to not send data before npm install, and disable it after --- lib/packages/PackageManager.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/packages/PackageManager.ts b/lib/packages/PackageManager.ts index 9e95d3822..36c1d3f49 100644 --- a/lib/packages/PackageManager.ts +++ b/lib/packages/PackageManager.ts @@ -66,6 +66,9 @@ export class PackageManager { let command: string; let managerCommand: string; + const oldSkipAnalytic = config.skipAnalytic; + config.skipAnalytic = true; + managerCommand = this.getManager(); switch (managerCommand) { case "npm": @@ -85,9 +88,9 @@ export class PackageManager { Util.log(`Packages installed successfully`); } config.packagesInstalled = true; + config.skipAnalytic = oldSkipAnalytic; ProjectConfig.setConfig(config); } - } public static removePackage(packageName: string, verbose: boolean = false): boolean { From e472ec7c745e2713132377cafef10110cf3de3b4 Mon Sep 17 00:00:00 2001 From: wnvko Date: Thu, 12 Apr 2018 11:51:19 +0300 Subject: [PATCH 2/2] test: fix failing tests --- spec/unit/packageManager-spec.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spec/unit/packageManager-spec.ts b/spec/unit/packageManager-spec.ts index 6d592ac40..3065645fc 100644 --- a/spec/unit/packageManager-spec.ts +++ b/spec/unit/packageManager-spec.ts @@ -186,7 +186,8 @@ describe("Unit - Package Manager", () => { }); it("Should run installPackages properly with error code", async done => { spyOn(ProjectConfig, "getConfig").and.returnValue({ - packagesInstalled: false + packagesInstalled: false, + skipAnalytic: false }); spyOn(Util, "log"); spyOn(shell, "exec").and.returnValue({ @@ -201,12 +202,13 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledWith(`Error installing npm packages.`); expect(Util.log).toHaveBeenCalledWith(`Example`); expect(shell.exec).toHaveBeenCalledWith(`npm install --quiet`, {silent: true}); - expect(ProjectConfig.setConfig).toHaveBeenCalledWith({packagesInstalled: true}); + expect(ProjectConfig.setConfig).toHaveBeenCalledWith({packagesInstalled: true, skipAnalytic: false}); done(); }); it("Should run installPackages properly without error code", async done => { spyOn(ProjectConfig, "getConfig").and.returnValue({ - packagesInstalled: false + packagesInstalled: false, + skipAnalytic: true }); spyOn(Util, "log"); spyOn(shell, "exec").and.returnValue({ @@ -219,7 +221,7 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`); expect(Util.log).toHaveBeenCalledWith(`Packages installed successfully`); expect(shell.exec).toHaveBeenCalledWith(`npm install --quiet`, {silent: true}); - expect(ProjectConfig.setConfig).toHaveBeenCalledWith({packagesInstalled: true}); + expect(ProjectConfig.setConfig).toHaveBeenCalledWith({packagesInstalled: true, skipAnalytic: true}); done(); }); it("Should run removePackage properly with error code", async done => {