0db253b55f
The Health dashboard's "Trigger failover" confirmation offered a red button
labelled *Delete*. The copy was right; the button was not. `DialogHost` derived
the confirm label solely from `danger`, so `danger: true` meant the verb was
literally "Delete" for every caller — and no caller could say otherwise, because
`IDialogService.ConfirmAsync` had no label parameter.
`danger` now selects styling only; a new optional `confirmLabel` names the action
and wins over the fallback. The kind/danger fallback is deliberately RETAINED
("Save" for a prompt, "Delete" for a bare danger confirm, "Confirm" otherwise):
around 20 call sites are genuine deletes where it is correct, and the Playwright
suites click the literal "Delete". Requiring the label everywhere would have
churned those 20 sites for no behaviour change, with the miss-detection resting
on Playwright runs that need a live rig.
Audited all 34 confirm call sites; 9 read "Delete" for something that is not a
delete and are relabelled:
Fail over CentralFailoverControl (central pair, site pair)
Approve SecuredWrites — approve (this one WRITES TO A DEVICE)
Reject SecuredWrites — reject
Disable Topology — disable instance
Discard SiteCallsReport, NotificationReport, ParkedMessages (bulk + single)
The remaining 25 are correct as they stand: 18 genuine deletes plus 7 non-danger
confirms ("Revert to base", the three Retry paths) whose button reads "Confirm".
Tests: FailoverConfirmLabelTests drives the real DialogService behind a real
DialogHost — a substitute would pin the argument but not what the operator reads
— covering both branches, that the button keeps btn-danger, and that an
unlabelled danger confirm still falls back to "Delete". Note its click is
deliberately not awaited: with a real dialog the handler parks on ConfirmAsync
until answered, so awaiting deadlocks. Existing IDialogService fakes and
NSubstitute matchers gain the 4th parameter (an optional param is baked into the
call site, so a 3-arg Arg.Any stub silently stops matching a labelled call).
208 lines
8.0 KiB
C#
208 lines
8.0 KiB
C#
using System.Security.Claims;
|
|
using ZB.MOM.WW.ScadaBridge.Security;
|
|
using Bunit;
|
|
using Microsoft.AspNetCore.Components.Authorization;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using NSubstitute;
|
|
using ZB.MOM.WW.ScadaBridge.CentralUI.Components.Shared;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Entities.Notifications;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Repositories;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
|
|
using NotificationListsPage = ZB.MOM.WW.ScadaBridge.CentralUI.Components.Pages.Notifications.NotificationLists;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.CentralUI.Tests.Pages;
|
|
|
|
/// <summary>
|
|
/// bUnit rendering tests for the standalone Notification Lists page (Task 7).
|
|
/// </summary>
|
|
public class NotificationListsPageTests : BunitContext
|
|
{
|
|
private void WireAuthAndDialog()
|
|
{
|
|
Services.AddSingleton<IDialogService>(new AlwaysConfirmDialogService());
|
|
|
|
var claims = new[]
|
|
{
|
|
new Claim(JwtTokenService.UsernameClaimType, "tester"),
|
|
new Claim(JwtTokenService.RoleClaimType, "Designer"),
|
|
};
|
|
var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
|
|
Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
|
|
Services.AddAuthorizationCore();
|
|
}
|
|
|
|
[Fact]
|
|
public void RendersNotificationListRows()
|
|
{
|
|
var repo = Substitute.For<INotificationRepository>();
|
|
repo.GetAllNotificationListsAsync()
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationList>>(
|
|
new List<NotificationList> { new("Ops On-Call") { Id = 1 } }));
|
|
repo.GetRecipientsByListIdAsync(1)
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationRecipient>>(
|
|
new List<NotificationRecipient> { new("Jane", "jane@example.com") }));
|
|
Services.AddSingleton(repo);
|
|
WireAuthAndDialog();
|
|
|
|
var cut = Render<NotificationListsPage>();
|
|
|
|
cut.WaitForAssertion(() =>
|
|
{
|
|
Assert.Contains("Ops On-Call", cut.Markup);
|
|
Assert.Contains("jane@example.com", cut.Markup);
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public void ShowsEmptyState_WhenNoLists()
|
|
{
|
|
var repo = Substitute.For<INotificationRepository>();
|
|
repo.GetAllNotificationListsAsync()
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationList>>(
|
|
new List<NotificationList>()));
|
|
Services.AddSingleton(repo);
|
|
WireAuthAndDialog();
|
|
|
|
var cut = Render<NotificationListsPage>();
|
|
|
|
cut.WaitForAssertion(() =>
|
|
Assert.Contains("No notification lists", cut.Markup));
|
|
}
|
|
|
|
[Fact]
|
|
public void DeleteList_ConfirmsThenDeletesAndReloads()
|
|
{
|
|
var repo = Substitute.For<INotificationRepository>();
|
|
repo.GetAllNotificationListsAsync()
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationList>>(
|
|
new List<NotificationList> { new("Ops On-Call") { Id = 1 } }));
|
|
repo.GetRecipientsByListIdAsync(1)
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationRecipient>>(
|
|
new List<NotificationRecipient>()));
|
|
Services.AddSingleton(repo);
|
|
WireAuthAndDialog();
|
|
|
|
var cut = Render<NotificationListsPage>();
|
|
|
|
cut.WaitForState(() => cut.Markup.Contains("Ops On-Call"));
|
|
|
|
var deleteButton = cut.FindAll("tbody tr button")
|
|
.First(b => b.TextContent.Contains("Delete"));
|
|
deleteButton.Click();
|
|
|
|
cut.WaitForAssertion(() =>
|
|
{
|
|
repo.Received().DeleteNotificationListAsync(1);
|
|
repo.Received().SaveChangesAsync();
|
|
// Reload re-invokes the list query (once on init, once after delete).
|
|
repo.Received(2).GetAllNotificationListsAsync();
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public void RendersTypeColumn_Sms()
|
|
{
|
|
var repo = Substitute.For<INotificationRepository>();
|
|
repo.GetAllNotificationListsAsync()
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationList>>(
|
|
new List<NotificationList>
|
|
{
|
|
new("SMS Alerts") { Id = 2, Type = NotificationType.Sms }
|
|
}));
|
|
repo.GetRecipientsByListIdAsync(2)
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationRecipient>>(
|
|
new List<NotificationRecipient>()));
|
|
Services.AddSingleton(repo);
|
|
WireAuthAndDialog();
|
|
|
|
var cut = Render<NotificationListsPage>();
|
|
|
|
cut.WaitForAssertion(() =>
|
|
{
|
|
Assert.Contains("SMS Alerts", cut.Markup);
|
|
Assert.Contains("Sms", cut.Markup);
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public void SmsListRecipientBadge_ShowsPhoneNumber_NotEmptyAngleBrackets()
|
|
{
|
|
// CentralUI-NNN regression: an SMS recipient carries a PhoneNumber and a null
|
|
// EmailAddress. The badge must render the phone, not the email-shaped "Name <>".
|
|
var repo = Substitute.For<INotificationRepository>();
|
|
repo.GetAllNotificationListsAsync()
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationList>>(
|
|
new List<NotificationList>
|
|
{
|
|
new("SMS Alerts") { Id = 7, Type = NotificationType.Sms }
|
|
}));
|
|
repo.GetRecipientsByListIdAsync(7)
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationRecipient>>(
|
|
new List<NotificationRecipient> { NotificationRecipient.ForSms("Jane", "+15551234567") }));
|
|
Services.AddSingleton(repo);
|
|
WireAuthAndDialog();
|
|
|
|
var cut = Render<NotificationListsPage>();
|
|
|
|
cut.WaitForAssertion(() =>
|
|
{
|
|
Assert.Contains("+15551234567", cut.Markup);
|
|
// The bug rendered an empty contact field ("Jane <>") for SMS recipients.
|
|
Assert.DoesNotContain("Jane <>", cut.Markup);
|
|
Assert.DoesNotContain("Jane <>", cut.Markup);
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public void RendersTypeColumn_Email()
|
|
{
|
|
// The list name deliberately contains no channel word so that the only "Email"
|
|
// in the rendered markup originates from the Type column cell, not the name cell.
|
|
// This guards against false-passes where the name itself satisfies the assertion.
|
|
var repo = Substitute.For<INotificationRepository>();
|
|
repo.GetAllNotificationListsAsync()
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationList>>(
|
|
new List<NotificationList>
|
|
{
|
|
new("Ops Alerts") { Id = 3, Type = NotificationType.Email }
|
|
}));
|
|
repo.GetRecipientsByListIdAsync(3)
|
|
.Returns(Task.FromResult<IReadOnlyList<NotificationRecipient>>(
|
|
new List<NotificationRecipient>()));
|
|
Services.AddSingleton(repo);
|
|
WireAuthAndDialog();
|
|
|
|
var cut = Render<NotificationListsPage>();
|
|
|
|
cut.WaitForAssertion(() =>
|
|
{
|
|
// Verify the row name rendered.
|
|
Assert.Contains("Ops Alerts", cut.Markup);
|
|
|
|
// Locate the Type <td> in the rendered table row and assert its text content
|
|
// is exactly "Email". If the Type column were removed the <td> would not
|
|
// exist and the assertion would throw, catching the regression.
|
|
var typeCell = cut.FindAll("tbody tr td")
|
|
.FirstOrDefault(td => td.TextContent.Trim() == "Email");
|
|
Assert.NotNull(typeCell);
|
|
});
|
|
}
|
|
|
|
/// <summary>A dialog service that auto-confirms, so action paths run end-to-end.</summary>
|
|
private sealed class AlwaysConfirmDialogService : IDialogService
|
|
{
|
|
public Task<bool> ConfirmAsync(string title, string message, bool danger = false, string? confirmLabel = null)
|
|
=> Task.FromResult(true);
|
|
|
|
public Task<string?> PromptAsync(
|
|
string title, string label, string initialValue = "", string? placeholder = null)
|
|
=> Task.FromResult<string?>(null);
|
|
|
|
public Task<TResult?> ShowAsync<TResult>(
|
|
string title,
|
|
Microsoft.AspNetCore.Components.RenderFragment<DialogContext<TResult>> body,
|
|
string? size = null)
|
|
=> Task.FromResult<TResult?>(default);
|
|
}
|
|
}
|