huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Design] Harden template package installer and fix name (#7624) 

Harden template package installer and fix name
This commit is contained in:
Ryan Brandenburg 2019-02-19 14:41:59 -08:00 committed by GitHub
parent d1fac57734
commit 69abefa06f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs
View File

@ -5,6 +5,7 @@ using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.CommandLineUtils;
using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
namespace Templates.Test.Helpers namespace Templates.Test.Helpers
@ -95,21 +96,21 @@ namespace Templates.Test.Helpers
} }
VerifyCannotFindTemplate(output, "web"); VerifyCannotFindTemplate(output, "web");
VerifyCannotFindTemplate(output, "razor"); VerifyCannotFindTemplate(output, "webapp");
VerifyCannotFindTemplate(output, "mvc");
VerifyCannotFindTemplate(output, "react"); VerifyCannotFindTemplate(output, "react");
VerifyCannotFindTemplate(output, "reactredux"); VerifyCannotFindTemplate(output, "reactredux");
VerifyCannotFindTemplate(output, "angular"); VerifyCannotFindTemplate(output, "angular");
var builtPackages = MondoHelpers.GetNupkgFiles(); var builtPackages = MondoHelpers.GetNupkgFiles();
foreach (var packagePath in builtPackages) var templatePackages = builtPackages.Where(b => _templatePackages.Any(t => Path.GetFileName(b).StartsWith(t, StringComparison.OrdinalIgnoreCase)));
Assert.Equal(4, templatePackages.Count());
foreach (var packagePath in templatePackages)
{ {
if (_templatePackages.Any(name => Path.GetFileName(packagePath).StartsWith(name, StringComparison.OrdinalIgnoreCase))) output.WriteLine($"Installing templates package {packagePath}...");
{ RunDotNetNew(output, $"--install \"{packagePath}\"", assertSuccess: true);
output.WriteLine($"Installing templates package {packagePath}...");
RunDotNetNew(output, $"--install \"{packagePath}\"", assertSuccess: true);
}
} }
VerifyCanFindTemplate(output, "razor"); VerifyCanFindTemplate(output, "webapp");
VerifyCanFindTemplate(output, "web"); VerifyCanFindTemplate(output, "web");
VerifyCanFindTemplate(output, "react"); VerifyCanFindTemplate(output, "react");
} }
@ -117,7 +118,7 @@ namespace Templates.Test.Helpers
private static void VerifyCanFindTemplate(ITestOutputHelper output, string templateName) private static void VerifyCanFindTemplate(ITestOutputHelper output, string templateName)
{ {
var proc = RunDotNetNew(output, $"", assertSuccess: false); var proc = RunDotNetNew(output, $"", assertSuccess: false);
if (!proc.Output.Contains($" {templateName}")) if (!proc.Output.Contains($" {templateName} "))
{ {
throw new InvalidOperationException($"Couldn't find {templateName} as an option in {proc.Output}."); throw new InvalidOperationException($"Couldn't find {templateName} as an option in {proc.Output}.");
} }