test(playwright): align E2E nav tests with current NavMenu

The role-navigation and navigation E2E tests asserted on a stale nav model —
labels 'Data Connections', 'Instances', 'Areas' that NavMenu.razor no longer
uses, 'Connections' mapped to /admin instead of /design, and Event Logs /
Parked Messages treated as all-roles when they are Deployment-role gated.
SitesPage_ShowsTable expected an HTML <table> but Sites.razor renders site
cards. Corrected the expectations to the actual NavMenu/Sites markup; the
role-based authorization itself was already correct. Suite: 43/43.
This commit is contained in:
Joseph Doherty
2026-05-18 02:42:44 -04:00
parent 579522c586
commit fa7b12c4a3
3 changed files with 43 additions and 32 deletions

View File

@@ -25,9 +25,9 @@ public class NavigationTests
[Theory] [Theory]
[InlineData("Sites", "/admin/sites")] [InlineData("Sites", "/admin/sites")]
[InlineData("Connections", "/admin/connections")]
[InlineData("API Keys", "/admin/api-keys")] [InlineData("API Keys", "/admin/api-keys")]
[InlineData("LDAP Mappings", "/admin/ldap-mappings")] [InlineData("LDAP Mappings", "/admin/ldap-mappings")]
[InlineData("SMTP Configuration", "/admin/smtp")]
public async Task AdminNavLinks_NavigateCorrectly(string linkText, string expectedPath) public async Task AdminNavLinks_NavigateCorrectly(string linkText, string expectedPath)
{ {
var page = await _fixture.NewAuthenticatedPageAsync(); var page = await _fixture.NewAuthenticatedPageAsync();
@@ -37,6 +37,7 @@ public class NavigationTests
[Theory] [Theory]
[InlineData("Templates", "/design/templates")] [InlineData("Templates", "/design/templates")]
[InlineData("Shared Scripts", "/design/shared-scripts")] [InlineData("Shared Scripts", "/design/shared-scripts")]
[InlineData("Connections", "/design/connections")]
[InlineData("External Systems", "/design/external-systems")] [InlineData("External Systems", "/design/external-systems")]
public async Task DesignNavLinks_NavigateCorrectly(string linkText, string expectedPath) public async Task DesignNavLinks_NavigateCorrectly(string linkText, string expectedPath)
{ {

View File

@@ -12,10 +12,10 @@ namespace ScadaLink.CentralUI.PlaywrightTests;
/// multi-role → Admin + Design + Deployment /// multi-role → Admin + Design + Deployment
/// ///
/// Nav structure (from NavMenu.razor): /// Nav structure (from NavMenu.razor):
/// All authenticated: Dashboard, Monitoring (Health Dashboard, Event Logs, Parked Messages) /// All authenticated: Dashboard, Health Dashboard
/// Admin: LDAP Mappings, Sites, Data Connections, API Keys, Audit Log /// Admin: LDAP Mappings, Sites, API Keys, SMTP Configuration, Audit Log
/// Design: Templates, Shared Scripts, External Systems, Areas /// Design: Templates, Shared Scripts, Connections, External Systems
/// Deployment: Instances, Deployments, Debug View /// Deployment: Topology, Deployments, Debug View, Event Logs, Parked Messages
/// </summary> /// </summary>
[Collection("Playwright")] [Collection("Playwright")]
public class RoleNavigationTests public class RoleNavigationTests
@@ -34,10 +34,10 @@ public class RoleNavigationTests
{ {
var page = await _fixture.NewAuthenticatedPageAsync("admin", "password"); var page = await _fixture.NewAuthenticatedPageAsync("admin", "password");
await AssertNavLinkVisible(page, "Sites");
await AssertNavLinkVisible(page, "Data Connections");
await AssertNavLinkVisible(page, "API Keys");
await AssertNavLinkVisible(page, "LDAP Mappings"); await AssertNavLinkVisible(page, "LDAP Mappings");
await AssertNavLinkVisible(page, "Sites");
await AssertNavLinkVisible(page, "API Keys");
await AssertNavLinkVisible(page, "SMTP Configuration");
await AssertNavLinkVisible(page, "Audit Log"); await AssertNavLinkVisible(page, "Audit Log");
} }
@@ -48,6 +48,7 @@ public class RoleNavigationTests
await AssertNavLinkHidden(page, "Templates"); await AssertNavLinkHidden(page, "Templates");
await AssertNavLinkHidden(page, "Shared Scripts"); await AssertNavLinkHidden(page, "Shared Scripts");
await AssertNavLinkHidden(page, "Connections");
await AssertNavLinkHidden(page, "External Systems"); await AssertNavLinkHidden(page, "External Systems");
} }
@@ -56,19 +57,21 @@ public class RoleNavigationTests
{ {
var page = await _fixture.NewAuthenticatedPageAsync("admin", "password"); var page = await _fixture.NewAuthenticatedPageAsync("admin", "password");
await AssertNavLinkHidden(page, "Instances"); await AssertNavLinkHidden(page, "Topology");
await AssertNavLinkHidden(page, "Deployments"); await AssertNavLinkHidden(page, "Deployments");
await AssertNavLinkHidden(page, "Debug View"); await AssertNavLinkHidden(page, "Debug View");
} }
[Fact] [Fact]
public async Task AdminUser_SeesMonitoringSection() public async Task AdminUser_SeesHealthDashboard_NotDeploymentMonitoring()
{ {
var page = await _fixture.NewAuthenticatedPageAsync("admin", "password"); var page = await _fixture.NewAuthenticatedPageAsync("admin", "password");
// Health Dashboard is all-roles; Event Logs and Parked Messages are
// Deployment-role only (NavMenu.razor / Component-CentralUI).
await AssertNavLinkVisible(page, "Health Dashboard"); await AssertNavLinkVisible(page, "Health Dashboard");
await AssertNavLinkVisible(page, "Event Logs"); await AssertNavLinkHidden(page, "Event Logs");
await AssertNavLinkVisible(page, "Parked Messages"); await AssertNavLinkHidden(page, "Parked Messages");
} }
// ── Design-only user ──────────────────────────────────────────── // ── Design-only user ────────────────────────────────────────────
@@ -80,8 +83,8 @@ public class RoleNavigationTests
await AssertNavLinkVisible(page, "Templates"); await AssertNavLinkVisible(page, "Templates");
await AssertNavLinkVisible(page, "Shared Scripts"); await AssertNavLinkVisible(page, "Shared Scripts");
await AssertNavLinkVisible(page, "Connections");
await AssertNavLinkVisible(page, "External Systems"); await AssertNavLinkVisible(page, "External Systems");
await AssertNavLinkVisible(page, "Areas");
} }
[Fact] [Fact]
@@ -89,10 +92,10 @@ public class RoleNavigationTests
{ {
var page = await _fixture.NewAuthenticatedPageAsync("designer", "password"); var page = await _fixture.NewAuthenticatedPageAsync("designer", "password");
await AssertNavLinkHidden(page, "Sites");
await AssertNavLinkHidden(page, "Data Connections");
await AssertNavLinkHidden(page, "API Keys");
await AssertNavLinkHidden(page, "LDAP Mappings"); await AssertNavLinkHidden(page, "LDAP Mappings");
await AssertNavLinkHidden(page, "Sites");
await AssertNavLinkHidden(page, "API Keys");
await AssertNavLinkHidden(page, "SMTP Configuration");
await AssertNavLinkHidden(page, "Audit Log"); await AssertNavLinkHidden(page, "Audit Log");
} }
@@ -101,19 +104,21 @@ public class RoleNavigationTests
{ {
var page = await _fixture.NewAuthenticatedPageAsync("designer", "password"); var page = await _fixture.NewAuthenticatedPageAsync("designer", "password");
await AssertNavLinkHidden(page, "Instances"); await AssertNavLinkHidden(page, "Topology");
await AssertNavLinkHidden(page, "Deployments"); await AssertNavLinkHidden(page, "Deployments");
await AssertNavLinkHidden(page, "Debug View"); await AssertNavLinkHidden(page, "Debug View");
} }
[Fact] [Fact]
public async Task DesignUser_SeesMonitoringButNotAuditLog() public async Task DesignUser_SeesHealthDashboard_NotDeploymentMonitoringOrAudit()
{ {
var page = await _fixture.NewAuthenticatedPageAsync("designer", "password"); var page = await _fixture.NewAuthenticatedPageAsync("designer", "password");
// A Design-only user sees the all-roles Health Dashboard but not the
// Deployment-gated Event Logs / Parked Messages, nor the Admin Audit Log.
await AssertNavLinkVisible(page, "Health Dashboard"); await AssertNavLinkVisible(page, "Health Dashboard");
await AssertNavLinkVisible(page, "Event Logs"); await AssertNavLinkHidden(page, "Event Logs");
await AssertNavLinkVisible(page, "Parked Messages"); await AssertNavLinkHidden(page, "Parked Messages");
await AssertNavLinkHidden(page, "Audit Log"); await AssertNavLinkHidden(page, "Audit Log");
} }
@@ -124,7 +129,7 @@ public class RoleNavigationTests
{ {
var page = await _fixture.NewAuthenticatedPageAsync("deployer", "password"); var page = await _fixture.NewAuthenticatedPageAsync("deployer", "password");
await AssertNavLinkVisible(page, "Instances"); await AssertNavLinkVisible(page, "Topology");
await AssertNavLinkVisible(page, "Deployments"); await AssertNavLinkVisible(page, "Deployments");
await AssertNavLinkVisible(page, "Debug View"); await AssertNavLinkVisible(page, "Debug View");
} }
@@ -134,10 +139,10 @@ public class RoleNavigationTests
{ {
var page = await _fixture.NewAuthenticatedPageAsync("deployer", "password"); var page = await _fixture.NewAuthenticatedPageAsync("deployer", "password");
await AssertNavLinkHidden(page, "Sites");
await AssertNavLinkHidden(page, "Data Connections");
await AssertNavLinkHidden(page, "API Keys");
await AssertNavLinkHidden(page, "LDAP Mappings"); await AssertNavLinkHidden(page, "LDAP Mappings");
await AssertNavLinkHidden(page, "Sites");
await AssertNavLinkHidden(page, "API Keys");
await AssertNavLinkHidden(page, "SMTP Configuration");
await AssertNavLinkHidden(page, "Audit Log"); await AssertNavLinkHidden(page, "Audit Log");
} }
@@ -148,6 +153,7 @@ public class RoleNavigationTests
await AssertNavLinkHidden(page, "Templates"); await AssertNavLinkHidden(page, "Templates");
await AssertNavLinkHidden(page, "Shared Scripts"); await AssertNavLinkHidden(page, "Shared Scripts");
await AssertNavLinkHidden(page, "Connections");
await AssertNavLinkHidden(page, "External Systems"); await AssertNavLinkHidden(page, "External Systems");
} }
@@ -156,6 +162,8 @@ public class RoleNavigationTests
{ {
var page = await _fixture.NewAuthenticatedPageAsync("deployer", "password"); var page = await _fixture.NewAuthenticatedPageAsync("deployer", "password");
// Event Logs and Parked Messages are Deployment-role gated, so a
// Deployment user sees them; Audit Log is Admin-only.
await AssertNavLinkVisible(page, "Health Dashboard"); await AssertNavLinkVisible(page, "Health Dashboard");
await AssertNavLinkVisible(page, "Event Logs"); await AssertNavLinkVisible(page, "Event Logs");
await AssertNavLinkVisible(page, "Parked Messages"); await AssertNavLinkVisible(page, "Parked Messages");
@@ -170,24 +178,24 @@ public class RoleNavigationTests
var page = await _fixture.NewAuthenticatedPageAsync("multi-role", "password"); var page = await _fixture.NewAuthenticatedPageAsync("multi-role", "password");
// Admin // Admin
await AssertNavLinkVisible(page, "Sites");
await AssertNavLinkVisible(page, "Data Connections");
await AssertNavLinkVisible(page, "API Keys");
await AssertNavLinkVisible(page, "LDAP Mappings"); await AssertNavLinkVisible(page, "LDAP Mappings");
await AssertNavLinkVisible(page, "Sites");
await AssertNavLinkVisible(page, "API Keys");
await AssertNavLinkVisible(page, "SMTP Configuration");
await AssertNavLinkVisible(page, "Audit Log"); await AssertNavLinkVisible(page, "Audit Log");
// Design // Design
await AssertNavLinkVisible(page, "Templates"); await AssertNavLinkVisible(page, "Templates");
await AssertNavLinkVisible(page, "Shared Scripts"); await AssertNavLinkVisible(page, "Shared Scripts");
await AssertNavLinkVisible(page, "Connections");
await AssertNavLinkVisible(page, "External Systems"); await AssertNavLinkVisible(page, "External Systems");
await AssertNavLinkVisible(page, "Areas");
// Deployment // Deployment
await AssertNavLinkVisible(page, "Instances"); await AssertNavLinkVisible(page, "Topology");
await AssertNavLinkVisible(page, "Deployments"); await AssertNavLinkVisible(page, "Deployments");
await AssertNavLinkVisible(page, "Debug View"); await AssertNavLinkVisible(page, "Debug View");
// Monitoring (all authenticated) // Monitoring
await AssertNavLinkVisible(page, "Health Dashboard"); await AssertNavLinkVisible(page, "Health Dashboard");
await AssertNavLinkVisible(page, "Event Logs"); await AssertNavLinkVisible(page, "Event Logs");
await AssertNavLinkVisible(page, "Parked Messages"); await AssertNavLinkVisible(page, "Parked Messages");

View File

@@ -13,15 +13,17 @@ public class SiteCrudTests
} }
[Fact] [Fact]
public async Task SitesPage_ShowsTable() public async Task SitesPage_ShowsSiteManagement()
{ {
var page = await _fixture.NewAuthenticatedPageAsync(); var page = await _fixture.NewAuthenticatedPageAsync();
await page.GotoAsync($"{PlaywrightFixture.BaseUrl}/admin/sites"); await page.GotoAsync($"{PlaywrightFixture.BaseUrl}/admin/sites");
await page.WaitForLoadStateAsync(LoadState.NetworkIdle); await page.WaitForLoadStateAsync(LoadState.NetworkIdle);
// Sites.razor renders the management page as a heading plus site cards
// (not an HTML table) and an always-present "Add Site" action.
await Expect(page.Locator("h4:has-text('Site Management')")).ToBeVisibleAsync(); await Expect(page.Locator("h4:has-text('Site Management')")).ToBeVisibleAsync();
await Expect(page.Locator("table")).ToBeVisibleAsync(); await Expect(page.Locator("button:has-text('Add Site')")).ToBeVisibleAsync();
} }
[Fact] [Fact]