Merge pull request #57 from TechnologyEnhancedLearning/feat-button-for-cicd-testing

Phil-NHS · web-flow · commit 0daecffcb8e2 · 2025-05-30T08:34:46.000+01:00
Feat button for cicd testing
diff --git a/.gitignore b/.gitignore
@@ -198,3 +198,4 @@ CHANGELOG.md
 
 
 /AllTestResults/coverage.cobertura.xml
+/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/*.txt
diff --git a/AllTestResults/coverage.cobertura.xml b/AllTestResults/coverage.cobertura.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/PackageSettings.props b/PackageSettings.props
@@ -7,6 +7,7 @@
     <NupkgOutputPath>$(NupkgOutputPath)</NupkgOutputPath>
 	
 	  <!--can be local folder-->
+	  
 	<TELBlazorPackageSource>$(TELBlazorPackageSource)</TELBlazorPackageSource>
 	
 	  <!--Use project reference for faster iteration in development-->
diff --git a/README.md b/README.md
diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/packages.lock.json b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/packages.lock.json
@@ -318,7 +318,7 @@
           "Blazored.LocalStorage": "[4.5.0, )",
           "Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
           "Serilog": "[4.2.0, )",
-          "TELBlazor.Components": "[10.9.9, )"
+          "TELBlazor.Components": "[1.4.0, )"
         }
       },
       "Microsoft.AspNetCore.Components.Web": {
diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.Development.json.template b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.Development.json.template
@@ -0,0 +1,35 @@
+﻿{
+  "APIs": {
+  },
+
+  "Serilog": {
+    "Using": [
+      "Serilog.Sinks.BrowserConsole"
+    ],
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Microsoft": "Warning",
+        "System": "Warning"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "BrowserConsole",
+        "Args": {
+          "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ],
+    "Properties": {
+      "Application": "TELBlazor ShowCase E2E Client",
+      "Environment": "Development"
+    }
+  },
+  "Properties": {
+    "Application": "TELBlazor ShowCase E2E Client",
+    "Environment": "Development"
+  },
+  "AllowedHosts": "*"
+}
diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/gitinclude2.txt b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/gitinclude2.txt
@@ -0,0 +1 @@
+﻿gitinclude
diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/gitinclude.rtf b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/gitinclude.rtf
@@ -0,0 +1 @@
+﻿gitinclude
diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/appsettings.json b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/appsettings.json
diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/packages.lock.json b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/packages.lock.json
@@ -355,7 +355,7 @@
           "Blazored.LocalStorage": "[4.5.0, )",
           "Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
           "Serilog": "[4.2.0, )",
-          "TELBlazor.Components": "[10.9.9, )"
+          "TELBlazor.Components": "[1.4.0, )"
         }
       },
       "Microsoft.AspNetCore.Components.Web": {
diff --git a/TELBlazor.Components.ShowCase.E2ETests/Helpers/BrowserHelper.cs b/TELBlazor.Components.ShowCase.E2ETests/Helpers/BrowserHelper.cs
@@ -9,6 +9,13 @@ namespace TELBlazor.Components.ShowCase.E2ETests.Helpers
 {
     public static class BrowserHelper
     {
+        // Setting value using PackageSetting.props potentially replace appsettings.Test.json in future especially if apis
+        static bool headless =>
+        #if HEADLESS_TESTING
+                        true;
+        #else
+                        false;
+        #endif
 
         public static async Task<IBrowserContext> CreateBrowserContextAsync(IPlaywright playwright, string browserType, bool jsEnabled, ViewportType viewport, string baseUrl)
         {
diff --git a/TELBlazor.Components.ShowCase.E2ETests/Reports/TELBlazorButtonMeetsAxeAccesibilityStandards_chromium_jsEnabled_True_Desktop_25_05_14_11_56_27.zip b/TELBlazor.Components.ShowCase.E2ETests/Reports/TELBlazorButtonMeetsAxeAccesibilityStandards_chromium_jsEnabled_True_Desktop_25_05_14_11_56_27.zip
diff --git a/TELBlazor.Components.ShowCase.E2ETests/TELBlazor.Components.ShowCase.E2ETests.csproj b/TELBlazor.Components.ShowCase.E2ETests/TELBlazor.Components.ShowCase.E2ETests.csproj
@@ -8,12 +8,9 @@
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <Configurations>Debug;Release;ci</Configurations>
-
+	  <DefineConstants Condition="'$(HeadlessTesting)' == 'true'">$(DefineConstants);HEADLESS_TESTING</DefineConstants>
   </PropertyGroup>
-	<Target Name="SetHeadlessTestingEnvVar" BeforeTargets="Build">
-		<Message Text="Setting HeadlessTesting: $(HeadlessTesting)" Importance="high" />
-		<Exec Command="set HEADLESS_TESTING $(HeadlessTesting)" />
-	</Target>
+	
   <ItemGroup>
 	  <PackageReference Include="AutoFixture" />
 	  <PackageReference Include="coverlet.msbuild" />
diff --git a/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json b/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json
@@ -1608,7 +1608,7 @@
           "Blazored.LocalStorage": "[4.5.0, )",
           "Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
           "Serilog": "[4.2.0, )",
-          "TELBlazor.Components": "[10.9.9, )"
+          "TELBlazor.Components": "[1.4.0, )"
         }
       },
       "Blazored.LocalStorage": {
diff --git a/TELBlazor.Components.ShowCase.Shared/packages.lock.json b/TELBlazor.Components.ShowCase.Shared/packages.lock.json
@@ -31,6 +31,19 @@
         "resolved": "4.2.0",
         "contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
       },
+      "TELBlazor.Components": {
+        "type": "Direct",
+        "requested": "[1.4.0, )",
+        "resolved": "1.4.0",
+        "contentHash": "2EVdlHZ8E7DZHSE6b+ZUFHTiRq0Vp9+7kMxyRkaRx3Di4B84rwX9Uo3bAzWf/0MrF9/rDslXEUpO/RdCkbECHA==",
+        "dependencies": {
+          "Microsoft.AspNetCore.Components.Web": "8.0.14",
+          "Microsoft.Extensions.DependencyInjection": "8.0.1",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
+          "Microsoft.Extensions.Http": "8.0.1",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
+        }
+      },
       "Microsoft.AspNetCore.Authorization": {
         "type": "Transitive",
         "resolved": "8.0.14",
@@ -154,13 +167,6 @@
         "resolved": "8.0.0",
         "contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA=="
       },
-      "telblazor.components": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
-          "Microsoft.Extensions.Http": "[8.0.1, )"
-        }
-      },
       "Microsoft.Extensions.DependencyInjection": {
         "type": "CentralTransitive",
         "requested": "[8.0.1, )",
diff --git a/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json b/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json
@@ -461,7 +461,7 @@
           "Blazored.LocalStorage": "[4.5.0, )",
           "Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
           "Serilog": "[4.2.0, )",
-          "TELBlazor.Components": "[10.9.9, )"
+          "TELBlazor.Components": "[1.4.0, )"
         }
       },
       "Microsoft.AspNetCore.Components.Web": {
diff --git a/TELBlazor.Components.UnitTests/packages.lock.json b/TELBlazor.Components.UnitTests/packages.lock.json
@@ -139,6 +139,19 @@
           "xunit.core": "2.4.1"
         }
       },
+      "TELBlazor.Components": {
+        "type": "Direct",
+        "requested": "[1.4.0, )",
+        "resolved": "1.4.0",
+        "contentHash": "2EVdlHZ8E7DZHSE6b+ZUFHTiRq0Vp9+7kMxyRkaRx3Di4B84rwX9Uo3bAzWf/0MrF9/rDslXEUpO/RdCkbECHA==",
+        "dependencies": {
+          "Microsoft.AspNetCore.Components.Web": "8.0.14",
+          "Microsoft.Extensions.DependencyInjection": "8.0.1",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
+          "Microsoft.Extensions.Http": "8.0.1",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
+        }
+      },
       "xunit": {
         "type": "Direct",
         "requested": "[2.9.0, )",
@@ -1666,13 +1679,6 @@
           "xunit.extensibility.core": "[2.9.0]"
         }
       },
-      "telblazor.components": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
-          "Microsoft.Extensions.Http": "[8.0.1, )"
-        }
-      },
       "Microsoft.AspNetCore.Components.Web": {
         "type": "CentralTransitive",
         "requested": "[8.0.14, )",
diff --git a/TELBlazor.Components/Components/TestComponents/CssSourceChecker.razor b/TELBlazor.Components/Components/TestComponents/CssSourceChecker.razor
@@ -1,3 +1,7 @@
 ﻿<p class="nhsuk-tag--green">!!!!!! Change example !!!!!!</p>
 <p class="nhsuk-tag--red">!!!!!! If im red we are getting nhsuk-tag-red !!!!!!</p>
 <p class="scoped-css-simple-counter-red">if im red we have scoped css (though for our scenario we probably will solely rely on nhsuk)</p>
+<div>
+    <h3 id="graphitti-wall">Graphitti Wall</h3>
+    <p>I ❤️ 🐄s</p>
+</div>
diff --git a/TELBlazor.Components/TELBlazor.Components.csproj b/TELBlazor.Components/TELBlazor.Components.csproj
@@ -55,7 +55,10 @@
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
-	<Target Name="WriteTELBlazorPackageVersionToFile" BeforeTargets="PrepareForBuild">
+	<Target Name="CleanVersionInfoFile" BeforeTargets="WriteTELBlazorPackageVersionToFile">
+		<Delete Files="TELBlazorPackageVersion/VersionInfo.cs" />
+	</Target>
+	<Target Name="WriteTELBlazorPackageVersionToFile" BeforeTargets="RunGulp">
 		<WriteLinesToFile File="wwwroot/TELBlazorPackageVersion.txt" Lines="$(TELBlazorPackageVersion)" Overwrite="true" Encoding="UTF-8" />
 		<WriteLinesToFile File="TELBlazorPackageVersion/VersionInfo.cs" Lines="namespace TELBlazor.Components.TELBlazorPackageVersion { public static class VersionInfo { public static string TELBlazorPackageVersion = &quot;$(TELBlazorPackageVersion)&quot; %3B; } }" Overwrite="true" Encoding="UTF-8" />
 	</Target>
diff --git a/TELBlazor.Components/TELBlazorPackageVersion/VersionInfo.cs b/TELBlazor.Components/TELBlazorPackageVersion/VersionInfo.cs
@@ -1,2 +1,2 @@
-﻿namespace TELBlazor.Components.TELBlazorPackageVersion { public static class VersionInfo { public static string TELBlazorPackageVersion = "10.9.9" ;
+﻿namespace TELBlazor.Components.TELBlazorPackageVersion { public static class VersionInfo { public static string TELBlazorPackageVersion = "1.4.0" ;
  public static string TELFrontEndPackageVersion = "0.0.2"; } }
diff --git a/TELBlazor.Components/wwwroot/TELBlazorPackageVersion.txt b/TELBlazor.Components/wwwroot/TELBlazorPackageVersion.txt
@@ -1 +1 @@
-﻿10.9.9
+﻿1.4.0
diff --git a/nuget.config b/nuget.config
@@ -3,8 +3,9 @@
 	<packageSources>
 		<clear />
 		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-		<!--set with local environment variable or cicd sed replacement-->
+
 		<add key="TELBlazorPackageSource" value="%TELBlazorPackageSource%" />
+		
 	</packageSources>
 	<packageSourceCredentials>
 		<TELBlazorPackageSource>

Original file line number	Diff line number	Diff line change
`@@ -198,3 +198,4 @@ CHANGELOG.md`
`198`	`198`
`199`	`199`
`200`	`200`	`/AllTestResults/coverage.cobertura.xml`
	`201`	`+/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/*.txt`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@`
`318`	`318`	`"Blazored.LocalStorage": "[4.5.0, )",`
`319`	`319`	`"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",`
`320`	`320`	`"Serilog": "[4.2.0, )",`
`321`		`- "TELBlazor.Components": "[10.9.9, )"`
	`321`	`+ "TELBlazor.Components": "[1.4.0, )"`
`322`	`322`	`}`
`323`	`323`	`},`
`324`	`324`	`"Microsoft.AspNetCore.Components.Web": {`