Run tests against 'dotnet new' output instead of Yeoman output

Author: SteveSandersonMS

test/package.json

@@ -23,8 +23,7 @@
 "selenium-standalone": "^5.9.0",
 "tree-kill": "^1.1.0",
 "typescript": "^2.1.4",
-"webdriverio": "^4.5.0",
-"yo": "^1.8.5"
+"webdriverio": "^4.5.0"
  },
 "devDependencies":{
 "wdio-junit-reporter": "^0.2.0",

test/templates/angular.spec.ts

@@ -1,21 +1,24 @@
 import*asfsfrom'fs';
 import*aspathfrom'path';
+import*asrimraffrom'rimraf';
 import{expect}from'chai';
-import{generateProjectSync}from'./util/yeoman';
+import{generateProjectSync}from'./util/dotnetnew';
 import{AspNetProcess,AspNetCoreEnviroment,defaultUrl,publishProjectSync}from'./util/aspnet';
 import{getValue,getCssPropertyValue}from'./util/webdriverio';
 
-// First, generate a new project using the locally-built generator-aspnetcore-spa
+// First, generate a new project using the locally-built templates package
 // Do this outside the Mocha fixture, otherwise Mocha will time out
 constappDir=path.resolve(__dirname,'../generated/angular');
 constpublishedAppDir=path.resolve(appDir,'./bin/Release/published');
+constpublishedAppDllName=path.basename(appDir)+'.dll';
 if(!process.env.SKIP_PROJECT_GENERATION){
-generateProjectSync(appDir,{
-framework: 'angular',
-name: 'Test App',
-tests: true
-});
+generateProjectSync(appDir,'angular');
 publishProjectSync(appDir,publishedAppDir);
+
+// Clear out any artifacts produced during publishing so they don't affect
+// the dev-mode application
+rimraf.sync(path.join(appDir,'ClientApp/dist'));
+rimraf.sync(path.join(appDir,'wwwroot/dist'));
 }
 
 functiontestBasicNavigation(){
@@ -95,6 +98,6 @@ describe('Angular template: dev mode', () =>{
 });
 
 describe('Angular template: production mode',()=>{
-AspNetProcess.RunInMochaContext(publishedAppDir,AspNetCoreEnviroment.production,'TestApp.dll');
+AspNetProcess.RunInMochaContext(publishedAppDir,AspNetCoreEnviroment.production,publishedAppDllName);
 testBasicNavigation();
 });

test/templates/util/dotnetnew.ts

@@ -0,0 +1,63 @@
+import*aschildProcessfrom'child_process';
+import*asfsfrom'fs';
+import*aspathfrom'path';
+import*asrimraffrom'rimraf';
+import*asmkdirpfrom'mkdirp';
+
+consttemplatePackageName='Microsoft.DotNet.Web.Spa.ProjectTemplates';
+consttemplatePackageArtifactsDir='../templates/package-builder/dist/artifacts';
+
+exportfunctiongenerateProjectSync(targetDir: string,templateName: string){
+installTemplatePackage(targetDir,templatePackageName,templateName);
+executeDotNetNewTemplateSync(targetDir,templateName);
+executeCommand('npm install',/* quiet */false,targetDir);
+}
+
+functioninstallTemplatePackage(targetDir: string,packageName: string,templateName: string){
+// First figure out which file is the latest one for this package
+constpackagePaths=fs.readdirSync(templatePackageArtifactsDir)
+.filter(name=>name.startsWith(templatePackageName+'.'))
+.filter(name=>path.extname(name)==='.nupkg')
+.map(name=>path.join(templatePackageArtifactsDir,name))
+.sort();
+constlatestPackagePath=packagePaths[packagePaths.length-1];
+
+if(!latestPackagePath){
+thrownewError(`Could not find ${packageName}.*.nupkg in directory ${templatePackageArtifactsDir}`);
+}
+
+// Uninstall any older version so we can be sure the new one did install
+try{
+console.log(`Uninstalling any prior version of ${packageName}...`);
+executeCommand(`dotnet new --uninstall ${packageName}`,/* quiet */true);
+}catch(ex){
+// Either no prior version existed, or we failed to uninstall. We'll determine
+// which it was next. 
+}
+try{
+console.log(`Verifying that no prior version of ${packageName} is still installed...`);
+executeDotNetNewTemplateSync(targetDir,templateName,/* quiet */true);
+thrownewError(`Failed to uninstall template package ${packageName}. The template '${templateName}' was not removed as expected.`);
+}catch(ex){
+// Looks like we successfully uninstalled it
+console.log(`Confirmed that no prior version of ${templatePackageName} remains installed.`);
+}
+
+// Now install the new version
+console.log(`Installing new templates package at ${latestPackagePath}...`);
+executeCommand(`dotnet new --install ${latestPackagePath}`,/* quiet */true);
+}
+
+functionexecuteDotNetNewTemplateSync(targetDir: string,templateName: string,quiet?: boolean){
+rimraf.sync(targetDir);
+mkdirp.sync(targetDir);
+executeCommand(`dotnet new ${templateName}`,quiet,targetDir);
+}
+
+functionexecuteCommand(command: string,quiet?: boolean,cwd?: string){
+childProcess.execSync(command,{
+ cwd,
+stdio: quiet ? null : 'inherit',
+encoding: 'utf8'
+});
+}