Add publish test for BlazorStandalone

pranavkm · pranavkm · commit 1c3ae1549e3f · 2020-01-03T15:05:53.000-08:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-serve": {
+      "version": "1.5.0",
+      "commands": [
+        "dotnet-serve"
+      ]
+    }
+  }
+}
diff --git a/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.CommandLineUtils;
 using OpenQA.Selenium;
 using Templates.Test.Helpers;
 using Xunit;
@@ -28,18 +28,30 @@ public BlazorWasmTemplateTest(ProjectFactoryFixture projectFactory, BrowserFixtu
         public async Task BlazorWasmStandaloneTemplate_Works()
         {
             var project = await ProjectFactory.GetOrCreateProject("blazorstandalone", Output);
+            project.TargetFramework = "netstandard2.1";
 
             var createResult = await project.RunDotNetNewAsync("blazorwasm");
             Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", project, createResult));
 
-            // We can't run a published standalone app, but let's just make sure it publishes fine
             var publishResult = await project.RunDotNetPublishAsync();
             Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", project, publishResult));
 
             var buildResult = await project.RunDotNetBuildAsync();
             Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", project, buildResult));
 
             await BuildAndRunTest(project.ProjectName, project);
+
+            var publishDir = Path.Combine(project.TemplatePublishDir, project.ProjectName, "dist");
+            AspNetProcess.EnsureDevelopmentCertificates();
+
+            Output.WriteLine("Running dotnet serve on published output...");
+            using var serveProcess = ProcessEx.Run(Output, publishDir, DotNetMuxer.MuxerPathOrDefault(), "serve -S");
+
+            // Todo: Use dynamic port assignment: https://github.com/natemcmaster/dotnet-serve/pull/40/files
+            var listeningUri = "https://localhost:8080";
+            Output.WriteLine($"Opening browser at {listeningUri}...");
+            Browser.Navigate().GoToUrl(listeningUri);
+            TestBasicNavigation(project.ProjectName);
         }
 
         [Fact]
@@ -70,7 +82,7 @@ public async Task BlazorWasmHostedTemplate_Works()
             if (BrowserFixture.IsHostAutomationSupported())
             {
                 aspNetProcess.VisitInBrowser(Browser);
-                TestBasicNavigation(project.ProjectName, serverProject);
+                TestBasicNavigation(project.ProjectName);
             }
             else
             {
@@ -90,15 +102,15 @@ protected async Task BuildAndRunTest(string appName, Project project)
             if (BrowserFixture.IsHostAutomationSupported())
             {
                 aspNetProcess.VisitInBrowser(Browser);
-                TestBasicNavigation(appName, project);
+                TestBasicNavigation(appName);
             }
             else
             {
                 BrowserFixture.EnforceSupportedConfigurations();
             }
         }
 
-        private void TestBasicNavigation(string appName, Project project)
+        private void TestBasicNavigation(string appName)
         {
             // Give components.server enough time to load so that it can replace
             // the prerendered content before we start making assertions.
diff --git a/src/ProjectTemplates/test/Helpers/AspNetProcess.cs b/src/ProjectTemplates/test/Helpers/AspNetProcess.cs
@@ -51,8 +51,7 @@ public AspNetProcess(
                 Timeout = TimeSpan.FromMinutes(2)
             };
 
-            var now = DateTimeOffset.Now;
-            new CertificateManager().EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1));
+            EnsureDevelopmentCertificates();
 
             output.WriteLine("Running ASP.NET application...");
 
@@ -64,6 +63,12 @@ public AspNetProcess(
             }
         }
 
+        internal static void EnsureDevelopmentCertificates()
+        {
+            var now = DateTimeOffset.Now;
+            new CertificateManager().EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1));
+        }
+
         public void VisitInBrowser(IWebDriver driver)
         {
             _output.WriteLine($"Opening browser at {ListeningUri}...");
diff --git a/src/ProjectTemplates/test/Helpers/Project.cs b/src/ProjectTemplates/test/Helpers/Project.cs
@@ -21,28 +21,27 @@ public class Project
     {
         private const string _urls = "http://127.0.0.1:0;https://127.0.0.1:0";
 
-        public const string DefaultFramework = "netcoreapp3.1";
-
         public static bool IsCIEnvironment => typeof(Project).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
             .Any(a => a.Key == "ContinuousIntegrationBuild");
 
-        public static string ArtifactsLogDir => typeof(Project).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
-            .Single(a => a.Key == "ArtifactsLogDir")?.Value;
+        public static string ArtifactsLogDir => GetAssemblyMetadata("ArtifactsLogDir");
 
         public SemaphoreSlim DotNetNewLock { get; set; }
         public SemaphoreSlim NodeLock { get; set; }
         public string ProjectName { get; set; }
         public string ProjectArguments { get; set; }
         public string ProjectGuid { get; set; }
         public string TemplateOutputDir { get; set; }
-        public string TemplateBuildDir => Path.Combine(TemplateOutputDir, "bin", "Debug", DefaultFramework);
-        public string TemplatePublishDir => Path.Combine(TemplateOutputDir, "bin", "Release", DefaultFramework, "publish");
+        public string TargetFramework { get; set; } = GetAssemblyMetadata("Test.DefaultTargetFramework");
+
+        public string TemplateBuildDir => Path.Combine(TemplateOutputDir, "bin", "Debug", TargetFramework);
+        public string TemplatePublishDir => Path.Combine(TemplateOutputDir, "bin", "Release", TargetFramework, "publish");
 
         private string TemplateServerDir => Path.Combine(TemplateOutputDir, $"{ProjectName}.Server");
         private string TemplateClientDir => Path.Combine(TemplateOutputDir, $"{ProjectName}.Client");
-        public string TemplateClientDebugDir => Path.Combine(TemplateClientDir, "bin", "Debug", DefaultFramework);
-        public string TemplateClientReleaseDir => Path.Combine(TemplateClientDir, "bin", "Release", DefaultFramework, "publish");
-        public string TemplateServerReleaseDir => Path.Combine(TemplateServerDir, "bin", "Release", DefaultFramework, "publish");
+        public string TemplateClientDebugDir => Path.Combine(TemplateClientDir, "bin", "Debug", TargetFramework);
+        public string TemplateClientReleaseDir => Path.Combine(TemplateClientDir, "bin", "Release", TargetFramework, "publish");
+        public string TemplateServerReleaseDir => Path.Combine(TemplateServerDir, "bin", "Release", TargetFramework, "publish");
 
         public ITestOutputHelper Output { get; set; }
         public IMessageSink DiagnosticsMessageSink { get; set; }
@@ -110,7 +109,7 @@ internal async Task<ProcessEx> RunDotNetNewAsync(
             }
         }
 
-        internal async Task<ProcessEx> RunDotNetPublishAsync(bool takeNodeLock = false, IDictionary<string,string> packageOptions = null, string additionalArgs = null)
+        internal async Task<ProcessEx> RunDotNetPublishAsync(bool takeNodeLock = false, IDictionary<string, string> packageOptions = null, string additionalArgs = null)
         {
             Output.WriteLine("Publishing ASP.NET application...");
 
@@ -132,7 +131,7 @@ internal async Task<ProcessEx> RunDotNetPublishAsync(bool takeNodeLock = false,
             }
         }
 
-        internal async Task<ProcessEx> RunDotNetBuildAsync(bool takeNodeLock = false, IDictionary<string,string> packageOptions = null, string additionalArgs = null)
+        internal async Task<ProcessEx> RunDotNetBuildAsync(bool takeNodeLock = false, IDictionary<string, string> packageOptions = null, string additionalArgs = null)
         {
             Output.WriteLine("Building ASP.NET application...");
 
@@ -524,5 +523,18 @@ private void CaptureBinLogOnFailure(ProcessEx result)
         }
 
         public override string ToString() => $"{ProjectName}: {TemplateOutputDir}";
+
+        private static string GetAssemblyMetadata(string key)
+        {
+            var attribute = typeof(Project).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
+                .FirstOrDefault(a => a.Key == key);
+
+            if (attribute is null)
+            {
+                throw new ArgumentException($"AssemblyMetadataAttribute with key {key} was not found.");
+            }
+
+            return attribute.Value;
+        }
     }
 }
diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
@@ -58,6 +58,10 @@
       <_Parameter1>TestPackageRestorePath</_Parameter1>
       <_Parameter2>$(TestPackageRestorePath)</_Parameter2>
     </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>Test.DefaultTargetFramework</_Parameter1>
+      <_Parameter2>$(DefaultNetCoreTargetFramework)</_Parameter2>
+    </AssemblyAttribute>
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(ContinuousIntegrationBuild)' == 'true'">
       <_Parameter1>ContinuousIntegrationBuild</_Parameter1>
       <_Parameter2>true</_Parameter2>

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Threading;`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using Microsoft.AspNetCore.E2ETesting;`
`9`		`-using Microsoft.AspNetCore.Testing;`
	`9`	`+using Microsoft.Extensions.CommandLineUtils;`
`10`	`10`	`using OpenQA.Selenium;`
`11`	`11`	`using Templates.Test.Helpers;`
`12`	`12`	`using Xunit;`
`@@ -28,18 +28,30 @@ public BlazorWasmTemplateTest(ProjectFactoryFixture projectFactory, BrowserFixtu`
`28`	`28`	`public async Task BlazorWasmStandaloneTemplate_Works()`
`29`	`29`	`{`
`30`	`30`	`var project = await ProjectFactory.GetOrCreateProject("blazorstandalone", Output);`
	`31`	`+ project.TargetFramework = "netstandard2.1";`
`31`	`32`
`32`	`33`	`var createResult = await project.RunDotNetNewAsync("blazorwasm");`
`33`	`34`	`Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", project, createResult));`
`34`	`35`
`35`		`- // We can't run a published standalone app, but let's just make sure it publishes fine`
`36`	`36`	`var publishResult = await project.RunDotNetPublishAsync();`
`37`	`37`	`Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", project, publishResult));`
`38`	`38`
`39`	`39`	`var buildResult = await project.RunDotNetBuildAsync();`
`40`	`40`	`Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", project, buildResult));`
`41`	`41`
`42`	`42`	`await BuildAndRunTest(project.ProjectName, project);`
	`43`	`+`
	`44`	`+ var publishDir = Path.Combine(project.TemplatePublishDir, project.ProjectName, "dist");`
	`45`	`+ AspNetProcess.EnsureDevelopmentCertificates();`
	`46`	`+`
	`47`	`+ Output.WriteLine("Running dotnet serve on published output...");`
	`48`	`+ using var serveProcess = ProcessEx.Run(Output, publishDir, DotNetMuxer.MuxerPathOrDefault(), "serve -S");`
	`49`	`+`
	`50`	`+ // Todo: Use dynamic port assignment: https://github.com/natemcmaster/dotnet-serve/pull/40/files`
	`51`	`+ var listeningUri = "https://localhost:8080";`
	`52`	`+ Output.WriteLine($"Opening browser at {listeningUri}...");`
	`53`	`+ Browser.Navigate().GoToUrl(listeningUri);`
	`54`	`+ TestBasicNavigation(project.ProjectName);`
`43`	`55`	`}`
`44`	`56`
`45`	`57`	`[Fact]`
`@@ -70,7 +82,7 @@ public async Task BlazorWasmHostedTemplate_Works()`
`70`	`82`	`if (BrowserFixture.IsHostAutomationSupported())`
`71`	`83`	`{`
`72`	`84`	`aspNetProcess.VisitInBrowser(Browser);`
`73`		`- TestBasicNavigation(project.ProjectName, serverProject);`
	`85`	`+ TestBasicNavigation(project.ProjectName);`
`74`	`86`	`}`
`75`	`87`	`else`
`76`	`88`	`{`
`@@ -90,15 +102,15 @@ protected async Task BuildAndRunTest(string appName, Project project)`
`90`	`102`	`if (BrowserFixture.IsHostAutomationSupported())`
`91`	`103`	`{`
`92`	`104`	`aspNetProcess.VisitInBrowser(Browser);`
`93`		`- TestBasicNavigation(appName, project);`
	`105`	`+ TestBasicNavigation(appName);`
`94`	`106`	`}`
`95`	`107`	`else`
`96`	`108`	`{`
`97`	`109`	`BrowserFixture.EnforceSupportedConfigurations();`
`98`	`110`	`}`
`99`	`111`	`}`
`100`	`112`
`101`		`- private void TestBasicNavigation(string appName, Project project)`
	`113`	`+ private void TestBasicNavigation(string appName)`
`102`	`114`	`{`
`103`	`115`	`// Give components.server enough time to load so that it can replace`
`104`	`116`	`// the prerendered content before we start making assertions.`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ public AspNetProcess(`
`51`	`51`	`Timeout = TimeSpan.FromMinutes(2)`
`52`	`52`	`};`
`53`	`53`
`54`		`- var now = DateTimeOffset.Now;`
`55`		`- new CertificateManager().EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1));`
	`54`	`+ EnsureDevelopmentCertificates();`
`56`	`55`
`57`	`56`	`output.WriteLine("Running ASP.NET application...");`
`58`	`57`
`@@ -64,6 +63,12 @@ public AspNetProcess(`
`64`	`63`	`}`
`65`	`64`	`}`
`66`	`65`
	`66`	`+ internal static void EnsureDevelopmentCertificates()`
	`67`	`+ {`
	`68`	`+ var now = DateTimeOffset.Now;`
	`69`	`+ new CertificateManager().EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1));`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`public void VisitInBrowser(IWebDriver driver)`
`68`	`73`	`{`
`69`	`74`	`_output.WriteLine($"Opening browser at {ListeningUri}...");`