diff --git a/aidlc-docs/features/ci-master-pipeline/overview.md b/aidlc-docs/features/ci-master-pipeline/overview.md index a217ad5..9cf4421 100644 --- a/aidlc-docs/features/ci-master-pipeline/overview.md +++ b/aidlc-docs/features/ci-master-pipeline/overview.md @@ -20,7 +20,7 @@ |---|---| | Website mode | `Website:Mode` (`SpaFallback` default, `PrerenderedPages`) from configuration (`CmsHostOptions.ResolveWebsiteMode`, decided once as `WebsiteModeSelection`). An unknown value stops the host. ASF sets `PrerenderedPages` in its own `appsettings.json`; no site chooses a mode in code. | | Master host | `SlpModularCms.Api` references all modules and has generic defaults for Website, Email, App, Contact and RateLimiting. | -| Tests | The ASF test project is gone (18 tests moved, none lost). Site composition and committed defaults: `Api.Tests/SiteContractTests` (reads each site's csproj and appsettings.json, no build of the site). Site behaviour: the master host run with a site's committed settings on top (`AsfVariantPipelineTests`, `SiteVariantContactTests`). Contact pipeline tests and the OpenAPI snapshot run on the master `Api` (snapshot unchanged). | +| Tests | The ASF test project is gone (18 tests moved, none lost). Site composition and committed defaults: `Api.Tests/SiteContractTests` (reads each site's csproj and appsettings.json, no build of the site). Site behaviour: the master host run with a site's committed settings on top (`AsfVariantPipelineTests`, `SiteVariantContactTests`). Contact pipeline tests and the OpenAPI snapshot run on the master `Api` (`Contact.Tests` references `SlpModularCms.Api`, not a site project). The snapshot changed in exactly three lines: the document title and two tag/assembly names went from `SlpModularCms.Api.SlpSoftware` to `SlpModularCms.Api` (the names come from the host assembly); no path or schema changed. | | CI | `backend-build`/`backend-test` use `SlpModularCms.Ci.slnf` (no site projects). `publish-sls-test` no longer runs on pull requests. `compile-sites` (not required) compiles the three site projects. After each test deploy `smoke-sls-test` / `smoke-asf-test` run `scripts/smoke-site.sh`. | | Branch protection | Required checks on `master`: `backend-test (pull_request)` and `frontend-test (pull_request)` only; the old `publish-test (pull_request)` requirement must be removed before the merge (see `docs/deploy-en-testomgevingen.md`). | diff --git a/openapi/slpsoftware.v1.json b/openapi/slpsoftware.v1.json index 8561907..087a0a7 100644 --- a/openapi/slpsoftware.v1.json +++ b/openapi/slpsoftware.v1.json @@ -1020,7 +1020,7 @@ } }, "info": { - "title": "SlpModularCms.Api.SlpSoftware | v1", + "title": "SlpModularCms.Api | v1", "version": "1.0.0" }, "openapi": "3.1.1", @@ -2658,14 +2658,14 @@ } }, "tags": [ - "SlpModularCms.Api.SlpSoftware" + "SlpModularCms.Api" ] } } }, "tags": [ { - "name": "SlpModularCms.Api.SlpSoftware" + "name": "SlpModularCms.Api" }, { "name": "System" diff --git a/src/SlpModularCms.Modules.Contact.Tests/ContactMailTests.cs b/src/SlpModularCms.Modules.Contact.Tests/ContactMailTests.cs index a7c3e28..bb8dea6 100644 --- a/src/SlpModularCms.Modules.Contact.Tests/ContactMailTests.cs +++ b/src/SlpModularCms.Modules.Contact.Tests/ContactMailTests.cs @@ -104,6 +104,23 @@ public class ContactMailSenderTests rig.Sent.Subject.Should().Be("Nieuw bericht via De Site"); } + [Theory] + [InlineData("nl", "Naam:", "E-mailadres:", "Onderwerp:", "Bericht:")] + [InlineData("en", "Name:", "E-mail address:", "Subject:", "Message:")] + public async Task TheDetailLabels_AreTheOnesOfTheMailLanguage(string language, string name, string email, string subject, string message) + { + var rig = new Rig(); + + await rig.Build(language).SendAsync(Message(), CancellationToken.None); + + var lines = rig.Sent!.TextBody!.Replace("\r\n", "\n").Split('\n'); + lines.Should().ContainInOrder(name, email, subject, message); + foreach (var label in new[] { name, email, subject, message }) + { + rig.Sent.HtmlBody.Should().Contain(">" + label.TrimEnd(':') + "<"); + } + } + [Fact] public async Task TheBody_EncodesHtml_AndKeepsLineBreaks_AndHasATextPart() { diff --git a/src/SlpModularCms.Modules.Contact.Tests/SlpModularCms.Modules.Contact.Tests.csproj b/src/SlpModularCms.Modules.Contact.Tests/SlpModularCms.Modules.Contact.Tests.csproj index 3c0fdc5..0deb856 100644 --- a/src/SlpModularCms.Modules.Contact.Tests/SlpModularCms.Modules.Contact.Tests.csproj +++ b/src/SlpModularCms.Modules.Contact.Tests/SlpModularCms.Modules.Contact.Tests.csproj @@ -33,7 +33,7 @@ - +