test: update more tests after project type removal

Author: damyanpetev

spec/acceptance/add-spec.ts

@@ -157,89 +157,6 @@ describe("Add command", () => {
 		fs.unlinkSync(ProjectConfig.configFile);
 	});
 
-	it("Should correctly add Angular template", async () => {
-		const mockConfig = {
-			project: {
-				framework: "angular",
-				projectType: "igx-ts",
-				components: [],
-			}
-		} as unknown as Config;
-
-		spyOn(ProjectConfig, "globalConfig").and.returnValue(mockConfig);
-
-		fs.writeFileSync(ProjectConfig.configFile, JSON.stringify({
-			project: mockConfig
-		}));
-		fs.mkdirSync(`./src`);
-		fs.mkdirSync(`./src/app`);
-		fs.writeFileSync("src/app/app-routing-module.ts", "const routes: Routes = [];");
-		fs.writeFileSync("src/app/app-module.ts", `@NgModule({
-			declarations: [
-			  App,
-			  HomeComponent
-			],
-			imports: [ BrowserModule ],
-			bootstrap: [App]
-		})
-		export class AppModule { }`);
-		await cli.run(["add", "grid", "Test view"]);
-
-		expect(console.error).toHaveBeenCalledTimes(0);
-		expect(console.log).toHaveBeenCalledWith(jasmine.stringMatching(/View 'Test view' added\s*/));
-
-		expect(fs.existsSync("./src/app/components/test-view")).toBeTruthy();
-		const componentPath = "./src/app/components/test-view/test-view.component.ts";
-		expect(fs.existsSync(componentPath)).toBeTruthy();
-		// file contents:
-		expect(fs.readFileSync(componentPath, "utf-8")).toContain("export class TestViewComponent");
-		expect(fs.readFileSync("src/app/app-routing-module.ts", "utf-8").replace(/\s/g, "")).toBe(
-			`import { TestViewComponent } from "./components/test-view/test-view.component";
-			const routes: Routes = [{ path: "test-view", component: TestViewComponent, data: { text: "Test view" } }];
-			`.replace(/\s/g, "")
-		);
-		expect(fs.readFileSync("src/app/app-module.ts", "utf-8").replace(/\s/g, "")).toBe(
-			`import { TestViewComponent } from "./components/test-view/test-view.component";
-			@NgModule({
-				declarations: [
-					App,
-					HomeComponent,
-					TestViewComponent
-				],
-				imports: [ BrowserModule ],
-				bootstrap: [App]
-			})
-			export class AppModule {
-			}
-			`.replace(/\s/g, "")
-		);
-		fs.unlinkSync("./src/app/components/test-view/test-view.component.ts");
-		fs.rmSync("./src", { recursive: true,  force: true });
-
-		fs.unlinkSync(ProjectConfig.configFile);
-
-		let expectedPrams: GoogleAnalyticsParameters = {
-			t: "screenview",
-			cd: "Add"
-		};
-		expect(GoogleAnalytics.post).toHaveBeenCalledWith(expectedPrams);
-
-		expectedPrams = {
-			t: "event",
-			ec: "$ig add",
-			ea: "template id: grid; file name: Test view",
-			cd1: "angular",
-			cd2: "igx-ts",
-			cd5: "Data Grids",
-			cd7: "grid",
-			cd8: "Grid",
-			cd11: false,
-			cd14: undefined
-		};
-		expect(GoogleAnalytics.post).toHaveBeenCalledWith(expectedPrams);
-		expect(GoogleAnalytics.post).toHaveBeenCalledTimes(2);
-	});
-
 	for (const igxPackage of [NPM_ANGULAR, FEED_ANGULAR]) {
 		it(`Should correctly add Ignite UI for Angular template - ${igxPackage}`, async () => {
 			const mockConfig = {} as unknown as Config;

spec/unit/TemplateManager-spec.ts

@@ -2,9 +2,9 @@ import { IgniteUIForAngularTemplate } from "@igniteui/angular-templates";
 import { ComponentGroup, Config, Framework, ProjectConfig, Util } from "@igniteui/cli-core";
 import * as path from "path";
 import { TemplateManager } from "../../packages/cli/lib/TemplateManager";
-import { AngularTemplate } from "../../packages/cli/lib/templates/AngularTemplate";
 import { jQueryTemplate } from "../../packages/cli/lib/templates/jQueryTemplate";
 import { ReactTemplate } from "../../packages/cli/lib/templates/ReactTemplate";
+import { IgniteUIForWebComponentsTemplate } from "../../packages//cli/lib/templates/IgniteUIForWebComponentsTemplate";
 import { mockProLibFactory } from "../helpers/mocks";
 import { resetSpy } from "../helpers/utils";
 
@@ -165,21 +165,22 @@ describe("Unit - Template manager", () => {
 	});
 
 	it("Should load/create/register diff types of external custom Templates", async () => {
-		spyOn(Util, "getDirectoryNames").and.returnValue(["jquery", "react", "angular"]);
+		spyOn(Util, "getDirectoryNames").and.returnValue(["jquery", "react", "angular", "webcomponents"]);
 		const templates = [
 			"file:/template/jquery/js",
 			"file:/template/react/es6",
-			"path:/template/angular/ig-ts",
+			"path:/template/webcomponents/igc-ts",
 			"/template/angular/igx-ts"
 		];
 		const mockProjectConfig = { customTemplates: templates } as unknown as Config;
 		spyOn(ProjectConfig, "getConfig").and.returnValue(mockProjectConfig);
 		spyOn(Util, "directoryExists").and.returnValue(true);
 		spyOn(Util, "fileExists").and.returnValue(true);
 		mockProjLibs = {
-			angular: [ mockProLibFactory("ig-ts"), mockProLibFactory("igx-ts")],
+			angular: [ mockProLibFactory("igx-ts")],
 			jquery: [ mockProLibFactory("js") ],
-			react: [ mockProLibFactory("es6") ]
+			react: [ mockProLibFactory("es6") ],
+			webcomponents: [ mockProLibFactory("igc-ts") ],
 		};
 		customRequire = {
 			require: modulePath => {
@@ -214,14 +215,14 @@ describe("Unit - Template manager", () => {
 		expect(mockProjLibs.react[0].registerTemplate).toHaveBeenCalledWith(
 			jasmine.objectContaining(template("react", "es6"))
 		);
+		expect(mockProjLibs.webcomponents[0].registerTemplate).toHaveBeenCalledTimes(1);
+		expect(mockProjLibs.webcomponents[0].registerTemplate).toHaveBeenCalledWith(jasmine.any(IgniteUIForWebComponentsTemplate));
+		expect(mockProjLibs.webcomponents[0].registerTemplate).toHaveBeenCalledWith(
+			jasmine.objectContaining(template("webcomponents", "igc-ts"))
+		);
 		expect(mockProjLibs.angular[0].registerTemplate).toHaveBeenCalledTimes(1);
-		expect(mockProjLibs.angular[0].registerTemplate).toHaveBeenCalledWith(jasmine.any(AngularTemplate));
+		expect(mockProjLibs.angular[0].registerTemplate).toHaveBeenCalledWith(jasmine.any(IgniteUIForAngularTemplate));
 		expect(mockProjLibs.angular[0].registerTemplate).toHaveBeenCalledWith(
-			jasmine.objectContaining(template("angular", "ig-ts"))
-		);
-		expect(mockProjLibs.angular[1].registerTemplate).toHaveBeenCalledTimes(1);
-		expect(mockProjLibs.angular[1].registerTemplate).toHaveBeenCalledWith(jasmine.any(IgniteUIForAngularTemplate));
-		expect(mockProjLibs.angular[1].registerTemplate).toHaveBeenCalledWith(
 			jasmine.objectContaining(template("angular", "igx-ts"))
 		);
 	});

spec/unit/Util-spec.ts

@@ -52,7 +52,7 @@ describe("Unit - Util", () => {
 		expect(Util.getAvailableName(defaultComponentName, false, "jQuery")).toEqual("grid 1");
 		expect(Util.getAvailableName(defaultComponentName, false, "React")).toEqual("grid 1");
 		expect(Util.getAvailableName(defaultComponentName, false, "Angular", "igx-ts")).toEqual("grid 1");
-		expect(Util.directoryExists).toHaveBeenCalledTimes(10);
+		expect(Util.directoryExists).toHaveBeenCalledTimes(8);
 	});
 
 	it("should read the existing component view name and return incremented view name ", () => {