reuse settings page navigation, minor fixes

Author: ahuseyn

plugins/wpgraphql-logging/tests/e2e/specs/basic-usage.spec.js

@@ -9,27 +9,25 @@ import {
 import { GET_POSTS_QUERY } from "../constants";
 
 test.describe("Basic Logging Usage", () => {
-	test.beforeEach(async ({ admin }) => {
+	test.beforeEach(async ({ admin, page }) => {
 		await resetPluginSettings(admin);
+
+		// Go to settings page
+		await goToLoggingSettingsPage(admin);
+		await expect(page.locator("h1")).toHaveText("WPGraphQL Logging Settings");
 	});
 
 	test("enables logging and logs GraphQL queries", async ({
 		page,
 		admin,
 		request,
 	}) => {
-		// Set up logging settings
-		await goToLoggingSettingsPage(admin);
-		await expect(page.locator("h1")).toHaveText("WPGraphQL Logging Settings");
-
 		await configureLogging(page, {
 			enabled: true,
 			dataSampling: "100",
 			eventLogSelection: ["graphql_request_results"],
 		});
 
-		await expect(page.locator(".notice.notice-success")).toBeVisible();
-
 		const response = await executeGraphQLQuery(request, GET_POSTS_QUERY);
 		expect(response.ok()).toBeTruthy();
 
@@ -71,19 +69,17 @@ test.describe("Basic Logging Usage", () => {
 	});
 
 	test("does not log when disabled", async ({ page, admin, request }) => {
+		await configureLogging(page, {
+			enabled: false,
+			dataSampling: "100",
+		});
+
 		// Make sure there are no logs
 		await goToLogsListPage(admin);
 		await expect(
 			page.locator('td.colspanchange:has-text("No items found.")')
 		).toBeVisible();
 
-		// Disable logging
-		await goToLoggingSettingsPage(admin);
-		await configureLogging(page, {
-			enabled: false,
-			dataSampling: "100",
-		});
-
 		await executeGraphQLQuery(request, GET_POSTS_QUERY);
 
 		// Navigate to logs and verify no new logs were created
@@ -98,18 +94,12 @@ test.describe("Basic Logging Usage", () => {
 		admin,
 		request,
 	}) => {
-		// Set up logging settings
-		await goToLoggingSettingsPage(admin);
-		await expect(page.locator("h1")).toHaveText("WPGraphQL Logging Settings");
-
 		await configureLogging(page, {
 			enabled: true,
 			dataSampling: "100",
 			eventLogSelection: ["graphql_request_results"],
 		});
 
-		await expect(page.locator(".notice.notice-success")).toBeVisible();
-
 		// Execute a GraphQL query
 		const response = await executeGraphQLQuery(request, GET_POSTS_QUERY);
 		expect(response.ok()).toBeTruthy();
@@ -150,42 +140,38 @@ test.describe("Basic Logging Usage", () => {
 		expect(content).toContain("GetPosts");
 	});
 
-	// test("should set data sampling to 10% and verify only 1 log is created", async ({
-	// 	page,
-	// 	admin,
-	// 	request,
-	// }) => {
-	// 	// Set up logging settings
-	// 	await goToLoggingSettingsPage(admin);
-	// 	await expect(page.locator("h1")).toHaveText("WPGraphQL Logging Settings");
-
-	// 	await configureLogging(page, {
-	// 		enabled: true,
-	// 		dataSampling: "50",
-	// 		eventLogSelection: ["graphql_request_results"],
-	// 	});
-
-	// 	await expect(page.locator(".notice.notice-success")).toBeVisible();
-
-	// 	// Execute a GraphQL queries
-	// 	const responses = await Promise.all(
-	// 		Array.from({ length: 10 }, async () =>
-	// 			executeGraphQLQuery(request, GET_POSTS_QUERY)
-	// 		)
-	// 	);
-	// 	await Promise.all(
-	// 		responses.map(async (response) => {
-	// 			return expect(response.ok()).toBeTruthy();
-	// 		})
-	// 	);
-
-	// 	// Navigate to logs and verify no new logs were created
-	// 	await goToLogsListPage(admin);
-	// 	await expect(page.locator("h1")).toContainText("WPGraphQL Logs");
-
-	// 	const logRow = page.locator("#the-list tr").filter({ hasText: "GetPosts" });
-
-	// 	const logCount = await logRow.count();
-	// 	expect(logCount).toBeLessThanOrEqual(5);
-	// });
+	test("should set data sampling to 10% and verify only 1 log is created", async ({
+		page,
+		admin,
+		request,
+	}) => {
+		const QUERY_COUNT = 5;
+
+		await configureLogging(page, {
+			enabled: true,
+			dataSampling: "25",
+			eventLogSelection: ["graphql_request_results"],
+		});
+
+		// Execute a GraphQL queries
+		const responses = await Promise.all(
+			Array.from({ length: QUERY_COUNT }, async () =>
+				executeGraphQLQuery(request, GET_POSTS_QUERY)
+			)
+		);
+		await Promise.all(
+			responses.map(async (response) => {
+				return expect(response.ok()).toBeTruthy();
+			})
+		);
+
+		// Navigate to logs and verify no new logs were created
+		await goToLogsListPage(admin);
+		await expect(page.locator("h1")).toContainText("WPGraphQL Logs");
+
+		const logRow = page.locator("#the-list tr").filter({ hasText: "GetPosts" });
+
+		const logCount = await logRow.count();
+		expect(logCount).toBeLessThan(QUERY_COUNT);
+	});
 });

plugins/wpgraphql-logging/tests/e2e/specs/data-cleanup.spec.js

@@ -7,26 +7,24 @@ import {
 } from "../utils";
 
 test.describe("Data Management", () => {
-	test.beforeEach(async ({ admin }) => {
+	test.beforeEach(async ({ admin, page }) => {
 		await resetPluginSettings(admin);
+
+		// Go to settings page
+		await goToLoggingSettingsPage(admin);
+		await expect(page.locator("h1")).toHaveText("WPGraphQL Logging Settings");
 	});
 
 	test("configures data deletion and verifies cron job", async ({
 		page,
 		admin,
 	}) => {
-		// Set up logging settings
-		await goToLoggingSettingsPage(admin);
-		await expect(page.locator("h1")).toHaveText("WPGraphQL Logging Settings");
-
 		await configureDataManagement(page, {
 			dataDeletionEnabled: true,
 			dataRetentionDays: "7",
 			dataSanitizationEnabled: false,
 		});
 
-		await expect(page.locator(".notice.notice-success")).toBeVisible();
-
 		// Reload the page to verify settings persisted
 		await page.reload({ waitUntil: "networkidle" });
 

plugins/wpgraphql-logging/tests/e2e/specs/exclude-and-sanitize.spec.js

@@ -6,32 +6,31 @@ import {
 	configureDataManagement,
 	executeGraphQLQuery,
 	resetPluginSettings,
+	switchToSettingsTab,
 } from "../utils";
 import { GET_POSTS_QUERY } from "../constants";
 
 test.describe("Query Filtering & Data Privacy", () => {
-	test.beforeEach(async ({ admin }) => {
+	test.beforeEach(async ({ admin, page }) => {
 		await resetPluginSettings(admin);
+
+		// Go to settings page
+		await goToLoggingSettingsPage(admin);
+		await expect(page.locator("h1")).toHaveText("WPGraphQL Logging Settings");
 	});
 
 	test("excludes configured queries from logs", async ({
 		page,
 		admin,
 		request,
 	}) => {
-		// Set up logging with GetPosts excluded
-		await goToLoggingSettingsPage(admin);
-		await expect(page.locator("h1")).toHaveText("WPGraphQL Logging Settings");
-
 		await configureLogging(page, {
 			enabled: true,
 			dataSampling: "100",
 			eventLogSelection: ["graphql_request_results"],
 			excludeQueries: "GetPosts",
 		});
 
-		await expect(page.locator(".notice.notice-success")).toBeVisible();
-
 		// Execute the excluded query
 		const response = await executeGraphQLQuery(request, GET_POSTS_QUERY);
 		expect(response.ok()).toBeTruthy();
@@ -46,17 +45,13 @@ test.describe("Query Filtering & Data Privacy", () => {
 	});
 
 	test("sanitizes sensitive data in logs", async ({ page, admin, request }) => {
-		// Set up logging settings and execute a GraphQL query
-		await goToLoggingSettingsPage(admin);
-		await expect(page.locator("h1")).toHaveText("WPGraphQL Logging Settings");
-
 		await configureLogging(page, {
 			enabled: true,
 			dataSampling: "100",
 			eventLogSelection: ["graphql_request_results"],
 		});
 
-		await goToLoggingSettingsPage(admin);
+		await switchToSettingsTab(page, "Data Management");
 		await configureDataManagement(page, {
 			dataSanitizationEnabled: true,
 			dataSanitizationMethod: "custom",