diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 4abfd90..e8054ba 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -25,7 +25,6 @@ env: # Build Set Up USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE: false DISABLE_PACKAGE_GENERATION: false - E2E_TRACING_ENABLED: false jobs: @@ -287,8 +286,7 @@ jobs: /p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \ /p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \ /p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \ - /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \ - /p:E2ETracingEnabled=$E2E_TRACING_ENABLED + /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION - name: Publish WasmStaticClient run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 77a0715..bb222bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,6 @@ env: # Build Set Up USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE: false DISABLE_PACKAGE_GENERATION: false - E2E_TRACING_ENABLED: false jobs: generate-semantic-version: @@ -144,8 +143,8 @@ jobs: # /p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \ # /p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \ # /p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \ - # /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \ - # /p:E2ETracingEnabled=$E2E_TRACING_ENABLED + # /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION + # - name: Build and pack TELBlazor.Components env: @@ -156,8 +155,7 @@ jobs: /p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \ /p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \ /p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \ - /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \ - /p:E2ETracingEnabled=$E2E_TRACING_ENABLED + /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION - name: Publish to TELBlazor.Components Package run: | @@ -244,8 +242,7 @@ jobs: /p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \ /p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \ /p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \ - /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \ - /p:E2ETracingEnabled=$E2E_TRACING_ENABLED + /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION - name: Publish WasmStaticClient TELBlazor ShowCase env: diff --git a/.github/workflows/reuseable-ci-checks.yml b/.github/workflows/reuseable-ci-checks.yml index 99bc5db..2345450 100644 --- a/.github/workflows/reuseable-ci-checks.yml +++ b/.github/workflows/reuseable-ci-checks.yml @@ -42,11 +42,9 @@ env: # May need coverlet.collector xplat if using the packaged version to test USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE: true DISABLE_PACKAGE_GENERATION: true - E2E_TRACING_ENABLED: false # Check Dummy Data TELBLAZOR_PACKAGE_VERSION: "0.0.0-ci-checks" - HEADLESS_TESTING: true jobs: @@ -113,8 +111,8 @@ jobs: /p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \ /p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \ /p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \ - /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \ - /p:E2ETracingEnabled=$E2E_TRACING_ENABLED + /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION + - name: Build solution without generating new package env: @@ -126,8 +124,8 @@ jobs: /p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \ /p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \ /p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \ - /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \ - /p:E2ETracingEnabled=$E2E_TRACING_ENABLED + /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION + reuseable-ci-checks-branch-name-check: name: Check branch names @@ -247,9 +245,7 @@ jobs: /p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \ /p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \ /p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \ - /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \ - /p:E2ETracingEnabled=$E2E_TRACING_ENABLED \ - /p:HeadlessTesting=$HEADLESS_TESTING + /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION - name: Ensure browsers are installed @@ -264,17 +260,14 @@ jobs: UseTELBlazorComponentsProjectReference: ${{ env.USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE }} TELBlazorPackageSource: ${{ env.TELBLAZOR_PACKAGE_SOURCE }} DisablePackageGeneration: ${{ env.DISABLE_PACKAGE_GENERATION }} - E2ETracingEnabled: ${{ env.E2E_TRACING_ENABLED }} - HeadlessTesting: ${{ env.HEADLESS_TESTING }} + run: | dotnet test --no-build --no-restore \ /p:TELBlazorPackageVersion=$TELBLAZOR_PACKAGE_VERSION \ /p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \ /p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \ /p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \ - /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \ - /p:E2ETracingEnabled=$E2E_TRACING_ENABLED \ - /p:HeadlessTesting=$HEADLESS_TESTING + /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION continue-on-error: true diff --git a/.gitignore b/.gitignore index 6d1d2d9..1b2e448 100644 --- a/.gitignore +++ b/.gitignore @@ -202,4 +202,7 @@ CHANGELOG.md /TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.json /TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.ci.json /TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.Development.json -/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.Production.json \ No newline at end of file +/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.Production.json +/TELBlazor.Components.ShowCase.E2ETests/appsettings.Production.json +/TELBlazor.Components.ShowCase.E2ETests/appsettings.json +/.runsettings diff --git a/.runsettingsTemplate b/.runsettingsTemplate new file mode 100644 index 0000000..8491451 --- /dev/null +++ b/.runsettingsTemplate @@ -0,0 +1,17 @@ + + + + + + True + ".runsettingsTemplate" + + + + + false + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b28dd7..af7bfc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,23 @@ -# [1.7.0](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.6.0...v1.7.0) (2025-06-09) +# [1.8.0-feat-button-for-cicd-testing.3](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.8.0-feat-button-for-cicd-testing.2...v1.8.0-feat-button-for-cicd-testing.3) (2025-06-16) ### Features -* **button:** lower testing threshold ([63ded2c](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/63ded2c82e656cdb94b9f98a6d38eeda9c7bc0ba)) -* **button:** optional implementation ([9a12d3c](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/9a12d3ce6ec6196c536958ab554f20a307c8096f)) +* **readme:** readme update ([1a9ad4b](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/1a9ad4bda0771dd78fbe4140c21e0a6f65a2b337)) -# [1.7.0-feat-button-for-cicd-testing.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.6.0...v1.7.0-feat-button-for-cicd-testing.1) (2025-06-09) +# [1.8.0-feat-button-for-cicd-testing.2](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.8.0-feat-button-for-cicd-testing.1...v1.8.0-feat-button-for-cicd-testing.2) (2025-06-16) ### Features -* **button:** lower testing threshold ([63ded2c](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/63ded2c82e656cdb94b9f98a6d38eeda9c7bc0ba)) -* **button:** optional implementation ([9a12d3c](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/9a12d3ce6ec6196c536958ab554f20a307c8096f)) +* **button:** changed .runsetting ([06470d7](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/06470d7e71e8a074653a176f87c1a3732f3b44f0)) +* **button:** commit before change env vars ([1e4377f](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/1e4377fc768e7d770b769536e123453c024e8320)) +* **button:** test fix ([022f427](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/022f42765e463f3f46e5e7b672979212cef36339)) +* **cicd:** changing to runsetting config ([3b828b2](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/3b828b28ea7cc6d577ef0e15d9c6f8bc452705e1)) + +# [1.8.0-feat-button-for-cicd-testing.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.7.0...v1.8.0-feat-button-for-cicd-testing.1) (2025-06-11) + + +### Features + +* **button:** versioning from assembly not file parsing ([4b8c773](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/4b8c77356a834de351ad703394eeb060e9a99c01)) diff --git a/CICD.runsettings b/CICD.runsettings new file mode 100644 index 0000000..5f2a63f --- /dev/null +++ b/CICD.runsettings @@ -0,0 +1,17 @@ + + + + + + False + "CICD.runsettings" + + + + + true + + + + + diff --git a/Directory.Build.props b/Directory.Build.props index 2470b1c..7e51687 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,27 +1,5 @@ - - - - - - true - cobertura - 30 - line - total - 30 - 30 - - - [TELBlazor.Components]* - ExcludeFromCodeCoverage - **/Program.cs,**/Components/TestComponents/*.* - true - - - $(MSBuildThisFileDirectory)AllTestResults/ - $(MSBuildThisFileDirectory)AllTestResults/coverage.json - - + + diff --git a/Directory.Packages.props b/Directory.Packages.props index bf7e19c..4b2a014 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,73 +1,62 @@ - - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PackageSettings.props b/PackageSettings.props index 81da566..eef9144 100644 --- a/PackageSettings.props +++ b/PackageSettings.props @@ -2,7 +2,29 @@ - + + + $(SolutionDir)\CICD.runsettings + + + true + cobertura + 30 + line + total + 30 + 30 + + + [TELBlazor.Components]* + ExcludeFromCodeCoverage + **/Program.cs,**/Components/TestComponents/*.* + true + + + $(MSBuildThisFileDirectory)AllTestResults/ + $(MSBuildThisFileDirectory)AllTestResults/coverage.json + $(NupkgOutputPath) @@ -21,10 +43,10 @@ $(DisablePackageGeneration) - false + diff --git a/PackageSettings.props.local.template b/PackageSettings.props.local.template index 2487358..6b0f3ba 100644 --- a/PackageSettings.props.local.template +++ b/PackageSettings.props.local.template @@ -16,10 +16,10 @@ true - + $(SolutionDir)\.runsettings - true - true + \ No newline at end of file diff --git a/README.md b/README.md index d649295..f40bfd3 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,8 @@ It is client side so the users browser will do the work. 1. Go to [TELBlazor Repo](https://github.com/TechnologyEnhancedLearning/TELBlazor) hit code and get the clone string 1. Clone the repo locally using powershell terminal 1. Go to [TELBlazor Repo](https://github.com/TechnologyEnhancedLearning/TELBlazor) - - create a branch (**there is branch name checks in cicd [branch lint rules](https://github.com/TechnologyEnhancedLearning/TELBlazor/blob/master/.releaserc.json)**) so for example call it "docs-readme-setup-instructions" - - your commits should look like this "docs(readme): added detail on commit rules" + - create a branch (**there is branch name checks in cicd [branch lint rules](https://github.com/TechnologyEnhancedLearning/TELBlazor/blob/master/.releaserc.json)**) so for example call it **"docs-readme-setup-instructions"** + - your commits should look like this **"docs(readme): added detail on commit rules"** 1. Fetch, and checkout your new branch locally so you can add to the readme as you go - create commit "docs(readme): first commit" - see [commit rules](https://github.com/TechnologyEnhancedLearning/TELBlazor/blob/master/.commitlintrc.json) @@ -200,8 +200,6 @@ changed. Remember to delete your lock files when changing which package your usi - if this were set to auto increment to a file accessible by other projects that would be ideal - **DisablePackageGeneration** we publish the package on build if this isnt flagged. Set it to true so you can build the solution without making the package - You may want to build the solution without package generation, the TELBlazor.Components with package generation for example - - **E2ETracingEnabled** set to true its for testing - - **HeadlessTesting** set to true unless you want to see what the E2E tests are doing in a browser while they test #### Create More Environment Variables - To use remote git hosted nuget packages you need a personal git token. This is just because git tracks the use of packages rather than it being anonymous @@ -252,6 +250,10 @@ TELPackage part of the config but with the system environment variable values yo #### Create appsettings *Be aware that because WASM code is in the browser appsettings in the wasm client projects are not secret and sensitive data should not go in them* +- **Solution Level** + - From the runsettingsTemplate you will make your local runnsettings for testing **".runsettings"** this is where you set tracing and headless + - From packagesettings.props.local.template make packagesettings.props.local + - packagesettings.props.local overwrite packagesettings.props in directory build props - **TELBlazor.Components.ShowCase.E2ETests.WasmServerHost** - create appsettings.Development.json - copy paste from appsettings.Development.json.template @@ -276,8 +278,9 @@ TELPackage part of the config but with the system environment variable values yo - **UseTELBlazorComponentsProjectReference** → true - **TELBlazorPackageVersion** → 1.0.0 will do for now - **DisablePackageGeneration** → true - - **E2ETracingEnabled** → true - - **HeadlessTesting** → true +- in .runsettings + - **TracingEnabled** → true + - **Headless** → false - right click the solution and copy full path (we need admin rights so dont just open terminal) - open powershell from windows as administrator - paste the route paste and cd to the solution folder @@ -346,7 +349,8 @@ TELPackage part of the config but with the system environment variable values yo - **TELBlazorPackageVersion** → pick something greater than [Find package number not dev package number, dev packages have -branchname](https://github.com/TechnologyEnhancedLearning/TELBlazor/pkgs/nuget/TELBlazor.Components) - make sure its changed so its more than the TELBlazor Package Version you previously noted - **DisablePackageGeneration** → false - - **E2ETracingEnabled** → false + - set .runsettings + - **Tracing** → false - **HeadlessTesting** → false *When doing package generation remember you need to keep incrementing the package number to get changes into the project, it would be nice to have this as an env value as an automated increment* @@ -379,8 +383,9 @@ TELPackage part of the config but with the system environment variable values yo - **UseTELBlazorComponentsProjectReference** → false - **TELBlazorPackageVersion** → [Find package number not dev package number, dev packages have -branchname](https://github.com/TechnologyEnhancedLearning/TELBlazor/pkgs/nuget/TELBlazor.Components) - **DisablePackageGeneration** → true - - **E2ETracingEnabled** → false - - **HeadlessTesting** → true + - set .runsettings + - **Tracing** → true + - **HeadlessTesting** → true - delete lock files - clean/build - *if caching issues close and reopen visual studio* diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs index c15b2f7..f625e3c 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs @@ -26,7 +26,7 @@ using TELBlazor.Components.Core.Configuration; using TELBlazor.Components.Core.Services.HelperServices; using TELBlazor.Components.ShowCase.E2ETests.WasmServerHost; -using TELBlazor.Components.ShowCase.Shared.Services.HelperServices; +using TELBlazor.Components.OptionalImplementations.Core.Services.HelperServices; var builder = WebAssemblyHostBuilder.CreateDefault(args); diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.csproj b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.csproj index 177c906..9830405 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.csproj +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.csproj @@ -35,6 +35,7 @@ + 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 index c230a53..a27101b 100644 --- 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 @@ -308,8 +308,10 @@ "telblazor.components": { "type": "Project", "dependencies": { + "Blazored.LocalStorage": "[4.5.0, )", "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", - "Microsoft.Extensions.Http": "[8.0.1, )" + "Microsoft.Extensions.Http": "[8.0.1, )", + "Serilog": "[4.2.0, )" } }, "telblazor.components.showcase.shared": { diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Program.cs b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Program.cs index cfc795d..fd02793 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Program.cs +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Program.cs @@ -26,7 +26,8 @@ using TELBlazor.Components.Core.Configuration; using TELBlazor.Components.Core.Services.HelperServices; using TELBlazor.Components.ShowCase.E2ETests.WasmServerHost; -using TELBlazor.Components.ShowCase.Shared.Services.HelperServices; +using TELBlazor.Components.OptionalImplementations.Core.Services.HelperServices; + var builder = WebApplication.CreateBuilder(args); 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 index 36aa268..2750846 100644 --- 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 @@ -330,8 +330,10 @@ "telblazor.components": { "type": "Project", "dependencies": { + "Blazored.LocalStorage": "[4.5.0, )", "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", - "Microsoft.Extensions.Http": "[8.0.1, )" + "Microsoft.Extensions.Http": "[8.0.1, )", + "Serilog": "[4.2.0, )" } }, "telblazor.components.showcase.e2etests.wasmserverhost.client": { @@ -346,6 +348,7 @@ "Serilog.Settings.Configuration": "[8.0.0, )", "Serilog.Sinks.BrowserConsole": "[8.0.0, )", "Serilog.Sinks.Http": "[8.0.0, )", + "TELBlazor.Components": "[1.4.0, )", "TELBlazor.Components.ShowCase.Shared": "[1.0.0, )" } }, diff --git a/TELBlazor.Components.ShowCase.E2ETests/BlazeWright/BlazorPageTest.cs b/TELBlazor.Components.ShowCase.E2ETests/BlazeWright/BlazorPageTest.cs index 06be73f..84e0a9a 100644 --- a/TELBlazor.Components.ShowCase.E2ETests/BlazeWright/BlazorPageTest.cs +++ b/TELBlazor.Components.ShowCase.E2ETests/BlazeWright/BlazorPageTest.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Hosting; -using Microsoft.Playwright.Xunit; +using Microsoft.Extensions.Configuration; using Microsoft.Playwright; +using Microsoft.Playwright.Xunit; using System.Threading.Tasks; namespace TELBlazor.Components.ShowCase.E2ETests.BlazeWright diff --git a/TELBlazor.Components.ShowCase.E2ETests/Helpers/BrowserHelper.cs b/TELBlazor.Components.ShowCase.E2ETests/Helpers/BrowserHelper.cs index 2c6ee15..05a1fa7 100644 --- a/TELBlazor.Components.ShowCase.E2ETests/Helpers/BrowserHelper.cs +++ b/TELBlazor.Components.ShowCase.E2ETests/Helpers/BrowserHelper.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -10,28 +11,28 @@ namespace TELBlazor.Components.ShowCase.E2ETests.Helpers public static class BrowserHelper { // qqqq Setting value using PackageSetting.props potentially replace appsettings.Test.json in future especially if using apis during testing - static bool headless => - #if HEADLESS_TESTING - true; - #else - false; - #endif + //static bool headless => + //#if HEADLESS_TESTING + // true; + //#else + // false; + //#endif public static async Task CreateBrowserContextAsync(IPlaywright playwright, string browserType, bool jsEnabled, ViewportType viewport, string baseUrl) { - + //bool headless = Headless IBrowser browser; switch (browserType.ToLower()) { case "chromium": - browser = await playwright.Chromium.LaunchAsync(new BrowserTypeLaunchOptions { Headless = headless }); + browser = await playwright.Chromium.LaunchAsync(new BrowserTypeLaunchOptions { /*Headless = headless*/ }); break; case "firefox": - browser = await playwright.Firefox.LaunchAsync(new BrowserTypeLaunchOptions { Headless = headless }); + browser = await playwright.Firefox.LaunchAsync(new BrowserTypeLaunchOptions { /*Headless = headless*/ }); break; case "webkit": - browser = await playwright.Webkit.LaunchAsync(new BrowserTypeLaunchOptions { Headless = headless }); + browser = await playwright.Webkit.LaunchAsync(new BrowserTypeLaunchOptions { /*Headless = headless*/ }); break; default: throw new ArgumentException($"Unsupported browser type: {browserType}"); diff --git a/TELBlazor.Components.ShowCase.E2ETests/Pages/BaseComponentPages/TELButtonPageTests.cs b/TELBlazor.Components.ShowCase.E2ETests/Pages/BaseComponentPages/TELButtonPageTests.cs index e973102..a3c304a 100644 --- a/TELBlazor.Components.ShowCase.E2ETests/Pages/BaseComponentPages/TELButtonPageTests.cs +++ b/TELBlazor.Components.ShowCase.E2ETests/Pages/BaseComponentPages/TELButtonPageTests.cs @@ -18,7 +18,8 @@ public class TELButtonPageTests : BlazorPageTest private readonly bool _tracingEnabled; public TELButtonPageTests() { - _tracingEnabled = (bool.TryParse(Environment.GetEnvironmentVariable("E2ETracingEnabled"), out var result) && result); + _tracingEnabled = (bool.TryParse(Environment.GetEnvironmentVariable("TracingEnabled"), out var result) && result); + var runFilenameqqqq = Environment.GetEnvironmentVariable("RunSettingFile"); } // Axe needs js @@ -41,6 +42,8 @@ public TELButtonPageTests() public async Task TELBlazorButtonMeetsAxeAccesibilityStandards(string browserType, bool jsEnabled, ViewportHelper.ViewportType viewport) { + + using IPlaywright playwright = await Microsoft.Playwright.Playwright.CreateAsync(); IBrowserContext browserContext = await BrowserHelper.CreateBrowserContextAsync(playwright, browserType, jsEnabled, viewport, BaseUrl); diff --git a/TELBlazor.Components.ShowCase.E2ETests/TELBlazor.Components.ShowCase.E2ETests.csproj b/TELBlazor.Components.ShowCase.E2ETests/TELBlazor.Components.ShowCase.E2ETests.csproj index ac14961..e38800c 100644 --- a/TELBlazor.Components.ShowCase.E2ETests/TELBlazor.Components.ShowCase.E2ETests.csproj +++ b/TELBlazor.Components.ShowCase.E2ETests/TELBlazor.Components.ShowCase.E2ETests.csproj @@ -8,7 +8,7 @@ false true Debug;Release;ci - $(DefineConstants);HEADLESS_TESTING + diff --git a/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json b/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json index de99fdd..4a3b33c 100644 --- a/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json +++ b/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json @@ -1565,8 +1565,10 @@ "telblazor.components": { "type": "Project", "dependencies": { + "Blazored.LocalStorage": "[4.5.0, )", "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", - "Microsoft.Extensions.Http": "[8.0.1, )" + "Microsoft.Extensions.Http": "[8.0.1, )", + "Serilog": "[4.2.0, )" } }, "telblazor.components.showcase.e2etests.wasmserverhost": { @@ -1599,6 +1601,7 @@ "Serilog.Settings.Configuration": "[8.0.0, )", "Serilog.Sinks.BrowserConsole": "[8.0.0, )", "Serilog.Sinks.Http": "[8.0.0, )", + "TELBlazor.Components": "[1.4.0, )", "TELBlazor.Components.ShowCase.Shared": "[1.0.0, )" } }, diff --git a/TELBlazor.Components.ShowCase.Shared/packages.lock.json b/TELBlazor.Components.ShowCase.Shared/packages.lock.json index a5e88aa..555483d 100644 --- a/TELBlazor.Components.ShowCase.Shared/packages.lock.json +++ b/TELBlazor.Components.ShowCase.Shared/packages.lock.json @@ -31,19 +31,6 @@ "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", @@ -167,6 +154,15 @@ "resolved": "8.0.0", "contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA==" }, + "telblazor.components": { + "type": "Project", + "dependencies": { + "Blazored.LocalStorage": "[4.5.0, )", + "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", + "Microsoft.Extensions.Http": "[8.0.1, )", + "Serilog": "[4.2.0, )" + } + }, "Microsoft.Extensions.DependencyInjection": { "type": "CentralTransitive", "requested": "[8.0.1, )", diff --git a/TELBlazor.Components.ShowCase.WasmStaticClient/Program.cs b/TELBlazor.Components.ShowCase.WasmStaticClient/Program.cs index 3ccfb3f..143e35f 100644 --- a/TELBlazor.Components.ShowCase.WasmStaticClient/Program.cs +++ b/TELBlazor.Components.ShowCase.WasmStaticClient/Program.cs @@ -27,8 +27,9 @@ // TELBlazor components using TELBlazor.Components.Core.Configuration; using TELBlazor.Components.Core.Services.HelperServices; -using TELBlazor.Components.ShowCase.Shared.Services.HelperServices; + using TELBlazor.Components.ShowCase.WasmStaticClient; +using TELBlazor.Components.OptionalImplementations.Core.Services.HelperServices; var builder = WebAssemblyHostBuilder.CreateDefault(args); diff --git a/TELBlazor.Components.ShowCase.WasmStaticClient/TELBlazor.Components.ShowCase.WasmStaticClient.csproj b/TELBlazor.Components.ShowCase.WasmStaticClient/TELBlazor.Components.ShowCase.WasmStaticClient.csproj index 3784033..341866a 100644 --- a/TELBlazor.Components.ShowCase.WasmStaticClient/TELBlazor.Components.ShowCase.WasmStaticClient.csproj +++ b/TELBlazor.Components.ShowCase.WasmStaticClient/TELBlazor.Components.ShowCase.WasmStaticClient.csproj @@ -46,6 +46,7 @@ + diff --git a/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json b/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json index e6fba4b..25e837f 100644 --- a/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json +++ b/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json @@ -451,8 +451,10 @@ "telblazor.components": { "type": "Project", "dependencies": { + "Blazored.LocalStorage": "[4.5.0, )", "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", - "Microsoft.Extensions.Http": "[8.0.1, )" + "Microsoft.Extensions.Http": "[8.0.1, )", + "Serilog": "[4.2.0, )" } }, "telblazor.components.showcase.shared": { diff --git a/TELBlazor.Components.UnitTests/Components/BaseComponents/TELButtonTests.razor b/TELBlazor.Components.UnitTests/Components/BaseComponents/TELButtonTests.razor index 6e5a44f..7ef4601 100644 --- a/TELBlazor.Components.UnitTests/Components/BaseComponents/TELButtonTests.razor +++ b/TELBlazor.Components.UnitTests/Components/BaseComponents/TELButtonTests.razor @@ -75,7 +75,7 @@ // Act var button = cut.Find("button[aria-label='Click the button']"); - var assistiveTextSpan = cut.Find("span"); // Assuming the assistive text uses this class + var assistiveTextSpan = cut.Find("span.nhsuk-u-visually-hidden"); // Assuming the assistive text uses this class button.Click(); // Assert diff --git a/TELBlazor.Components.UnitTests/packages.lock.json b/TELBlazor.Components.UnitTests/packages.lock.json index 4429e8d..2df466b 100644 --- a/TELBlazor.Components.UnitTests/packages.lock.json +++ b/TELBlazor.Components.UnitTests/packages.lock.json @@ -139,19 +139,6 @@ "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, )", @@ -1679,6 +1666,24 @@ "xunit.extensibility.core": "[2.9.0]" } }, + "telblazor.components": { + "type": "Project", + "dependencies": { + "Blazored.LocalStorage": "[4.5.0, )", + "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", + "Microsoft.Extensions.Http": "[8.0.1, )", + "Serilog": "[4.2.0, )" + } + }, + "Blazored.LocalStorage": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "6nZuJwA7zNIKx83IsObiHXZb09ponJOpCClU3en+hI8ZFvrOKXeOw+H7TegQZQrvdR1n9fkrVkEBQZg8vx6ZTw==", + "dependencies": { + "Microsoft.AspNetCore.Components.Web": "8.0.0" + } + }, "Microsoft.AspNetCore.Components.Web": { "type": "CentralTransitive", "requested": "[8.0.14, )", diff --git a/TELBlazor.Components/Components/BaseComponents/TELButtonSubComponent.razor b/TELBlazor.Components/Components/BaseComponents/TELButtonSubComponent.razor index f323bd1..a54cd03 100644 --- a/TELBlazor.Components/Components/BaseComponents/TELButtonSubComponent.razor +++ b/TELBlazor.Components/Components/BaseComponents/TELButtonSubComponent.razor @@ -8,7 +8,7 @@ aria-describedby="@AriaDescribedBy" title="@ToolTipTitle" tabindex="@TabIndex"> - @ButtonText + @ButtonText @if (!string.IsNullOrEmpty(AssistiveText)) { @AssistiveText diff --git a/TELBlazor.Components/OptionalImplementations/Core/Services/HelperServices/SerilogLogLevelSwitcher.cs b/TELBlazor.Components/OptionalImplementations/Core/Services/HelperServices/SerilogLogLevelSwitcher.cs index 591c8de..9706948 100644 --- a/TELBlazor.Components/OptionalImplementations/Core/Services/HelperServices/SerilogLogLevelSwitcher.cs +++ b/TELBlazor.Components/OptionalImplementations/Core/Services/HelperServices/SerilogLogLevelSwitcher.cs @@ -5,7 +5,7 @@ using Blazored.LocalStorage; using TELBlazor.Components.Core.Models.Logging; -namespace TELBlazor.Components.ShowCase.Shared.Services.HelperServices +namespace TELBlazor.Components.OptionalImplementations.Core.Services.HelperServices { /// /// The TELBlazor Component system uses serilog in testing etc, but you can use your own logging system instead diff --git a/TELBlazor.Components/TELBlazor.Components.csproj b/TELBlazor.Components/TELBlazor.Components.csproj index 1c62e67..aa7f8c3 100644 --- a/TELBlazor.Components/TELBlazor.Components.csproj +++ b/TELBlazor.Components/TELBlazor.Components.csproj @@ -48,9 +48,10 @@ - + + @@ -61,13 +62,6 @@ PreserveNewest - - - - - - -