Port #12879 to 3.1 (#14638)

* Port #12879 to 3.1

* PR feedback

Author: ryanbrandenburg

src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json

@@ -71,7 +71,7 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
-            "styles": ["styles.css"],
+            "styles": ["src/styles.css"],
             "scripts": [],
             "assets": ["src/assets"]
           }

src/ProjectTemplates/test/Helpers/ProcessEx.cs

@@ -104,14 +104,14 @@ public static ProcessEx Run(ITestOutputHelper output, string workingDirectory, s
             return new ProcessEx(output, proc);
         }
 
-        public static async Task<ProcessEx> RunViaShellAsync(ITestOutputHelper output, string workingDirectory, string commandAndArgs)
+        public static ProcessEx RunViaShell(ITestOutputHelper output, string workingDirectory, string commandAndArgs)
         {
             var (shellExe, argsPrefix) = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
                 ? ("cmd", "/c")
                 : ("bash", "-c");
 
             var result = Run(output, workingDirectory, shellExe, $"{argsPrefix} \"{commandAndArgs}\"");
-            await result.Exited;
+            result.WaitForExit(assertSuccess: false);
             return result;
         }
 
@@ -168,9 +168,14 @@ internal string GetFormattedOutput()
             return $"Process exited with code {_process.ExitCode}\nStdErr: {Error}\nStdOut: {Output}";
         }
 
-        public void WaitForExit(bool assertSuccess)
+        public void WaitForExit(bool assertSuccess, TimeSpan? timeSpan = null)
         {
-            Exited.Wait();
+            if(!timeSpan.HasValue)
+            {
+                timeSpan = TimeSpan.FromSeconds(480);
+            }
+
+            Exited.Wait(timeSpan.Value);
 
             if (assertSuccess && _process.ExitCode != 0)
             {

src/ProjectTemplates/test/Helpers/Project.cs

@@ -287,7 +287,7 @@ private async Task<ProcessEx> RestoreAsync(ITestOutputHelper output, string work
             try
             {
                 output.WriteLine($"Restoring NPM packages in '{workingDirectory}' using npm...");
-                var result = await ProcessEx.RunViaShellAsync(output, workingDirectory, "npm install");
+                var result = ProcessEx.RunViaShell(output, workingDirectory, "npm install");
                 return result;
             }
             finally

src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs

@@ -63,14 +63,14 @@ protected async Task SpaTemplateImplAsync(
             using var npmRestoreResult = await Project.RestoreWithRetryAsync(Output, clientAppSubdirPath);
             Assert.True(0 == npmRestoreResult.ExitCode, ErrorMessages.GetFailedProcessMessage("npm restore", Project, npmRestoreResult));
 
-            using var lintResult = await ProcessEx.RunViaShellAsync(Output, clientAppSubdirPath, "npm run lint");
+            using var lintResult = ProcessEx.RunViaShell(Output, clientAppSubdirPath, "npm run lint");
             Assert.True(0 == lintResult.ExitCode, ErrorMessages.GetFailedProcessMessage("npm run lint", Project, lintResult));
 
-            if (template == "react" || template == "reactredux")
-            {
-                using var testResult = await ProcessEx.RunViaShellAsync(Output, clientAppSubdirPath, "npm run test");
-                Assert.True(0 == testResult.ExitCode, ErrorMessages.GetFailedProcessMessage("npm run test", Project, testResult));
-            }
+            // The default behavior of angular tests is watch mode, which leaves the test process open after it finishes, which leads to delays/hangs.
+            var testcommand = "npm run test" + template == "angular" ? "-- --watch=false" : "";
+
+            using var testResult = ProcessEx.RunViaShell(Output, clientAppSubdirPath, testcommand);
+            Assert.True(0 == testResult.ExitCode, ErrorMessages.GetFailedProcessMessage("npm run test", Project, testResult));
 
             using var publishResult = await Project.RunDotNetPublishAsync();
             Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", Project, publishResult));
@@ -159,7 +159,7 @@ private async Task CleanupReactClientAppBuildFolder(string clientAppSubdirPath)
             {
                 try
                 {
-                    testResult = await ProcessEx.RunViaShellAsync(Output, clientAppSubdirPath, "npx rimraf ./build");
+                    testResult = ProcessEx.RunViaShell(Output, clientAppSubdirPath, "npx rimraf ./build");
                     testResultExitCode = testResult.ExitCode;
                     if (testResultExitCode == 0)
                     {