feat(wizard): finalize calling to upgrade command, #724

Test if upgrade command is called in prompt session test. Update prompt questions. Add skipInstall to new schematics. Co-authored-by: Damyan Petev <damyan.petev@gmail.com>
IgniteUI · May 26, 2020 · 41e1665 · 41e1665
1 parent a5633e3
commit 41e1665
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 19 deletions.
diff --git a/packages/cli/lib/PromptSession.ts b/packages/cli/lib/PromptSession.ts
@@ -6,6 +6,7 @@ import * as inquirer from "inquirer";
 import * as path from "path";
 import { default as add } from "./commands/add";
 import { default as start } from "./commands/start";
+import { default as upgrade } from "./commands/upgrade";
 import { TemplateManager } from "./TemplateManager";
 
 export class PromptSession extends BasePromptSession {
@@ -101,8 +102,9 @@ export class PromptSession extends BasePromptSession {
 		}
 	}
 
-	protected upgradePackages() {
-		// TODO: call update command
+	protected async upgradePackages() {
+		upgrade.templateManager = this.templateManager as TemplateManager;
+		await upgrade.upgrade({ skipInstall: true });
 	}
 
 	/**

diff --git a/packages/core/prompt/BasePromptSession.ts b/packages/core/prompt/BasePromptSession.ts
@@ -93,8 +93,8 @@ export abstract class BasePromptSession {
 	/** Install packages and run project */
 	protected abstract async completeAndRun(port?: number);
 
-	/** Upgrade packages to paid subscription bla bla bla */
-	protected abstract upgradePackages();
+	/** Upgrade packages to use private Infragistics feed */
+	protected abstract async upgradePackages();
 
 	/**
 	 * Get user name and set template's extra configurations if any
@@ -373,18 +373,22 @@ export abstract class BasePromptSession {
 		case "Complete & Run":
 			const config = ProjectConfig.localConfig();
 
-			if (config.project.framework === "angular" && !config.packagesInstalled) {
+			if (config.project.framework === "angular" &&
+				config.project.projectType === "igx-ts" &&
+				!config.packagesInstalled) {
 				// TODO: should we add check if there are paid components at all
-				const usePaidAngular = await this.getUserInput({
+				Util.log("The project will be created using a Trial version of Ignite UI for Angular.");
+				Util.log("You can always run the upgrade-packages command.");
+				const shouldUpgrade = await this.getUserInput({
 					type: "list",
-					name: "usePaidAngular",
-					message: "Do you have paid subscription:",
+					name: "shouldUpgrade",
+					message: "Would you like to upgrade to the licensed feed now (requires active subscription)?",
 					choices: [ "yes", "no" ],
 					default: "yes"
 				});
 
-				if (usePaidAngular === "yes") {
-					this.upgradePackages();
+				if (shouldUpgrade === "yes") {
+					await this.upgradePackages();
 				}
 			}
 

diff --git a/packages/ng-schematics/src/ng-new/index.ts b/packages/ng-schematics/src/ng-new/index.ts
@@ -158,7 +158,7 @@ export function newProject(options: OptionsSchema): Rule {
 				const installChain: TaskId[] = [];
 				if (prompt.userAnswers && prompt.userAnswers.get("upgradePackages")) {
 					const upgradeTaskId = context.addTask(
-						new RunSchematicTask("upgrade-packages", {}));
+						new RunSchematicTask("upgrade-packages", { skipInstall: true }));
 					installChain.push(upgradeTaskId);
 				}
 				if (!options.skipInstall) {

diff --git a/packages/ng-schematics/src/ng-new/index_spec.ts b/packages/ng-schematics/src/ng-new/index_spec.ts
@@ -61,7 +61,7 @@ describe("Schematics ng-new", () => {
 			const expectedUpgrade = {
 				collection: null,
 				name: "upgrade-packages",
-				options: {}
+				options: { skipInstall: true }
 			};
 			const expectedInstall: NodePackageTaskOptions = {
 				command: "install",
@@ -128,7 +128,7 @@ describe("Schematics ng-new", () => {
 			const expectedUpgrade = {
 				collection: null,
 				name: "upgrade-packages",
-				options: {}
+				options: { skipInstall: true }
 			};
 			const expectedInstall: NodePackageTaskOptions = {
 				command: "install",

diff --git a/packages/ng-schematics/src/prompt/SchematicsPromptSession.ts b/packages/ng-schematics/src/prompt/SchematicsPromptSession.ts
@@ -59,7 +59,7 @@ export class SchematicsPromptSession extends BasePromptSession {
 		// TODO?
 	}
 
-	protected upgradePackages() {
+	protected async upgradePackages() {
 		this.userAnswers.set("upgradePackages", true);
 	}
 

diff --git a/packages/ng-schematics/src/upgrade-packages/index.spec.ts b/packages/ng-schematics/src/upgrade-packages/index.spec.ts
@@ -57,8 +57,12 @@ describe("Schematics upgrade-packages", () => {
 		expect(runner.tasks).toEqual([]);
 
 		upgradeSpy.and.returnValue(Promise.resolve(true));
-		await runner.runSchematicAsync(schematicName, { }, appTree).toPromise();
+		await runner.runSchematicAsync(schematicName, { skipInstall: true }, appTree).toPromise();
 		expect(upgradeSpy).toHaveBeenCalledTimes(2);
+		expect(runner.tasks).toEqual([]);
+
+		await runner.runSchematicAsync(schematicName, { }, appTree).toPromise();
+		expect(upgradeSpy).toHaveBeenCalledTimes(3);
 		const installTaskOptions = new NodePackageInstallTask().toConfiguration();
 		expect(runner.tasks).toContain(jasmine.objectContaining(installTaskOptions));
 

diff --git a/packages/ng-schematics/src/upgrade-packages/index.ts b/packages/ng-schematics/src/upgrade-packages/index.ts
@@ -5,7 +5,11 @@ import { defer } from "rxjs";
 import { SchematicsTemplateManager } from "../SchematicsTemplateManager";
 import { setVirtual } from "../utils/NgFileSystem";
 
-export default function(_options: any): Rule {
+interface UpgradeOptions {
+	skipInstall?: boolean;
+}
+
+export default function(options: UpgradeOptions): Rule {
 	return (tree: Tree, context: SchematicContext) => {
 		App.initialize("angular-cli");
 		GoogleAnalytics.post({
@@ -19,7 +23,7 @@ export default function(_options: any): Rule {
 		setVirtual(tree);
 		return defer(async () => {
 			const success = await project.upgradeIgniteUIPackages("", "");
-			if (success) {
+			if (success && !options.skipInstall) {
 				context.addTask(new NodePackageInstallTask());
 			}
 			return tree;

diff --git a/packages/ng-schematics/src/upgrade-packages/schema.json b/packages/ng-schematics/src/upgrade-packages/schema.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsAngularNgNew",
+  "title": "Ignite UI for Angular Upgrade packages Options Schema",
+  "type": "object",
+  "properties": {
+    "skipInstall": {
+      "description": "Do not automatically install packages.",
+      "type": "boolean",
+      "default": false,
+      "alias": "si"
+    }
+  }
+}
diff --git a/spec/unit/PromptSession-spec.ts b/spec/unit/PromptSession-spec.ts
@@ -3,6 +3,7 @@ import * as inquirer from "inquirer";
 import * as path from "path";
 import { default as add } from "../../packages/cli/lib/commands/add";
 import { default as start } from "../../packages/cli/lib/commands/start";
+import { default as upgrade } from "../../packages/cli/lib/commands/upgrade";
 import { PromptSession } from "../../packages/cli/lib/PromptSession";
 import { TemplateManager } from "../../packages/cli/lib/TemplateManager";
 
@@ -452,7 +453,7 @@ describe("Unit - PromptSession", () => {
 		await mockSession.chooseActionLoop(mockProjectLibrary);
 		expect(mockSession.chooseActionLoop).toHaveBeenCalledTimes(1);
 		expect(inquirer.prompt).toHaveBeenCalledTimes(8);
-		expect(Util.log).toHaveBeenCalledTimes(3);
+		expect(Util.log).toHaveBeenCalledTimes(5);
 		expect(PackageManager.flushQueue).toHaveBeenCalledWith(true);
 		expect(start.start).toHaveBeenCalledTimes(1);
 		expect(Util.getAvailableName).toHaveBeenCalledTimes(1);
@@ -662,9 +663,13 @@ describe("Unit - PromptSession", () => {
 			Promise.resolve(4200)
 			);
 		spyOn(mockSession as any, "completeAndRun").and.returnValues(Promise.resolve());
+		spyOn(upgrade, "upgrade").and.returnValue(Promise.resolve());
+
 		await mockSession.chooseActionLoop({} as any);
 
-		// TODO: check if upgrade command was called
+		expect(upgrade.upgrade).toHaveBeenCalledTimes(1);
+		expect(upgrade.upgrade).toHaveBeenCalledWith({ skipInstall: true });
+
 		done();
 	});
 	it("start - Should fire correctly with Angular Custom theme selected", async done => {