🐛 Re-add WebUI.AcceptanceTests project.

jasontaylordev · Jul 8, 2023 · 6e8f920 · 6e8f920
1 parent c655328
commit 6e8f920
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/.template.config/template.json b/.template.config/template.json
@@ -130,7 +130,7 @@
             "src/WebUI/config-react.nswag",
             "src/WebUI/ClientApp-React/**",
             "src/WebUI/Templates/**",
-            "src/WebUI/AcceptanceTests/**"
+            "tests/WebUI.AcceptanceTests/**"
           ],
           "rename": {
             "config-webapi.nswag": "config.nswag",

diff --git a/CleanArchitecture.nuspec b/CleanArchitecture.nuspec
@@ -3,16 +3,16 @@
   <metadata>
 
     <id>Clean.Architecture.Solution.Template</id>
-    <version>8.0.0-preview.5.7</version>
+    <version>8.0.0-preview.5.8</version>
     <title>Clean Architecture Solution Template</title>
     <authors>JasonTaylorDev</authors>
     <description>Clean Architecture Solution Template for .NET 8.</description>
     <summary>
       A Clean Architecture Solution Template for creating a Single-Page Application (SPA) with ASP.NET Core.
     </summary>
     <releaseNotes>
-      Added support for both LocalDB (default) and SQLite.
-      Removed support for InMemory database.
+      Add WebUI acceptance tests (already existing but not added to solution).
+      Exclude WebUI acceptance tests from Web API only.
     </releaseNotes>
 
     <projectUrl>https://github.com/JasonTaylorDev/CleanArchitecture</projectUrl>

diff --git a/CleanArchitecture.sln b/CleanArchitecture.sln
@@ -28,6 +28,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 	EndProjectSection
 EndProject
+#if (!UseApiOnly)
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebUI.AcceptanceTests", "tests\WebUI.AcceptanceTests\WebUI.AcceptanceTests.csproj", "{B2A33F8A-CD4F-46D3-B04F-AF794952DB33}"
+EndProject
+#endif
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -62,6 +66,10 @@ Global
 		{22454EE9-16B3-4B7A-8352-37E59B858155}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{22454EE9-16B3-4B7A-8352-37E59B858155}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22454EE9-16B3-4B7A-8352-37E59B858155}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2A33F8A-CD4F-46D3-B04F-AF794952DB33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2A33F8A-CD4F-46D3-B04F-AF794952DB33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2A33F8A-CD4F-46D3-B04F-AF794952DB33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2A33F8A-CD4F-46D3-B04F-AF794952DB33}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,6 +82,7 @@ Global
 		{DC37FD87-552C-4613-9F16-1537CA522898} = {664D406C-2F83-48F0-BFC3-408D5CB53C65}
 		{277029AF-D9E1-4B75-9F11-48FEA7345AD7} = {664D406C-2F83-48F0-BFC3-408D5CB53C65}
 		{22454EE9-16B3-4B7A-8352-37E59B858155} = {6ED356A7-8B47-4613-AD01-C85CF28491BD}
+		{B2A33F8A-CD4F-46D3-B04F-AF794952DB33} = {664D406C-2F83-48F0-BFC3-408D5CB53C65}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3CB609D9-5D54-4C11-A371-DAAC8B74E430}

diff --git a/src/WebUI/Properties/launchSettings.json b/src/WebUI/Properties/launchSettings.json
@@ -9,19 +9,19 @@
   },
   "profiles": {
     "CleanArchitecture.WebUI": {
-        "commandName": "Project",
-        "launchBrowser": true,
-        "applicationUrl": "https://localhost:5001;http://localhost:5000",
-        //#if(UseApiOnly)
-        "launchUrl": "https://localhost:5001/api",
+      "commandName": "Project",
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      ////#if(UseApiOnly)
+      //"launchUrl": "https://localhost:5001/api",
+      ////#endif
+      "environmentVariables": {
+        //#if(!UseApiOnly)
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
         //#endif
-        "environmentVariables": {
-          //#if(!UseApiOnly)
-          "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
-          //#endif
-          "ASPNETCORE_ENVIRONMENT": "Development"
-        }
-      },
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
       "IIS Express": {
         "commandName": "IISExpress",
         "launchBrowser": true,