@atomicsmash/init-testing 2.0.0-beta.1 → 2.0.0-beta.3

package/dist/cli.js

@@ -80,7 +80,7 @@ for (const dirent of copyFiles) {
             ],
             [
                 "%%EXAMPLE_TEST_PROJECTS%%",
-                argv.noExample ? "" : "\n...exampleProjects,",
+                argv.noExample ? "" : "\n	...exampleProjects,",
             ],
             [
                 "%%UNIVERSAL_TEST_IMPORT%%",
@@ -90,7 +90,7 @@ for (const dirent of copyFiles) {
             ],
             [
                 "%%UNIVERSAL_TEST_PROJECTS%%",
-                argv.noUniversal ? "" : "\n...universalProjects,",
+                argv.noUniversal ? "" : "\n	...universalProjects,",
             ],
         ]) {
             data = data.replace(search, replace);
@@ -178,6 +178,7 @@ await Promise.all([
             "/blob-report/",
             "/playwright/.cache/",
             "/lighthouse/",
+            "/tests/.tmp/",
         ];
         const linesToAddToGitignore = [];
         for (const line of linesToCheck) {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@atomicsmash/init-testing",
 	"type": "module",
-	"version": "2.0.0-beta.1",
+	"version": "2.0.0-beta.3",
 	"description": "Allow us to easily add automated testing setup to any npm setup.",
 	"keywords": [
 		"atomic",

package/toCopy/playwright.config.mts

@@ -1,11 +1,13 @@
-import { defineConfig, devices, PlaywrightTestConfig } from "@playwright/test";
+import { defineConfig, PlaywrightTestConfig } from "@playwright/test";
 import { playwrightConfig } from "@atomicsmash/test-utils";
-import { projects as authProjects } from "./tests/auth";%%EXAMPLE_TEST_IMPORT%%%%UNIVERSAL_TEST_IMPORT%%
+import { projects as authProjects } from "./tests/auth/index.mjs";%%EXAMPLE_TEST_IMPORT%%%%UNIVERSAL_TEST_IMPORT%%
 
 const playwrightProjectsConfig = [
 	...authProjects,%%EXAMPLE_TEST_PROJECTS%%%%UNIVERSAL_TEST_PROJECTS%%
 ] satisfies PlaywrightTestConfig["projects"];
 
 export default defineConfig(playwrightConfig, {
+	testDir: "./tests",
 	use: { baseURL: `%%BASE_URL%%` },
+	projects: playwrightProjectsConfig,
 });

package/toCopy/tests/auth/{admin.setup.ts → admin.setup.mts}

@@ -1,13 +1,15 @@
 import { test as setup } from "@playwright/test";
-import { storageState } from "./index.js";
+import { storageState } from "./index.mjs";
 
 setup("Login as admin", async ({ page }) => {
 	await page.goto("/wp/wp-admin/");
 
 	await page
 		.getByLabel("Username or Email Address", { exact: true })
-		.fill("Bot");
-	await page.getByLabel("Password", { exact: true }).fill("password");
+		.fill(process.env.WORDPRESS_AUTOMATION_USER ?? "Bot");
+	await page
+		.getByLabel("Password", { exact: true })
+		.fill(process.env.WORDPRESS_AUTOMATION_PASSWORD ?? "password");
 
 	await page.getByRole("button", { name: "Log In", exact: true }).click();
 

package/toCopy/tests/auth/{admin.teardown.ts → admin.teardown.mts}

@@ -1,6 +1,6 @@
 import { unlink } from "node:fs/promises";
 import { test as teardown } from "@playwright/test";
-import { storageState } from "./index.js";
+import { storageState } from "./index.mjs";
 
 teardown("Login as admin teardown", async () => {
 	await unlink(storageState);

package/toCopy/tests/auth/{index.ts → index.mts}

@@ -8,13 +8,13 @@ export const projects = [
 		name: setupName,
 		use: { ...devices["Desktop Chrome"] },
 		testDir: "./tests/auth",
-		testMatch: /admin\.setup\.ts/,
+		testMatch: /admin\.setup\.mts/,
 		teardown: "Admin teardown",
 	},
 	{
 		name: tearDownName,
 		use: { ...devices["Desktop Chrome"] },
 		testDir: "./tests/auth",
-		testMatch: /admin\.teardown\.ts/,
+		testMatch: /admin\.teardown\.mts/,
 	},
 ] satisfies PlaywrightTestConfig["projects"];

package/toCopy/tests/e2e/example/index.mts

@@ -1,10 +1,10 @@
-import { PlaywrightTestConfig } from "@playwright/test";
 import { generateProjectsForAllBrowsers } from "@atomicsmash/test-utils";
+import { PlaywrightTestConfig } from "@playwright/test";
 
 export const projects = [
 	...generateProjectsForAllBrowsers({
 		name: "example_tests",
 		testDir: "./tests/e2e/example",
-		testMatch: /.*example\.test\.ts/,
+		testMatch: /.*example\.test\.mts/,
 	}),
 ] satisfies PlaywrightTestConfig["projects"];

package/toCopy/tests/e2e/universal/authenticated.test.mts

@@ -1,16 +1,28 @@
 import {
 	doLighthouseTest,
 	lighthouseTest,
+	doesRoleHaveHighEnoughPermissions,
 } from "@atomicsmash/test-utils";
 import { pagesToTest } from "../../playwright-utils.mjs";
 
+lighthouseTest.describe.configure({ mode: "parallel", retries: 3 });
 for (const pageToTest of pagesToTest) {
-	lighthouseTest(
-		`${pageToTest.name} @desktop @lighthouse`,
-		doLighthouseTest(pageToTest, "desktop", true),
-	);
-	lighthouseTest(
-		`${pageToTest.name} @mobile @lighthouse`,
-		doLighthouseTest(pageToTest, "mobile", true),
-	);
+	if (
+		// If a page requires any kind of login
+		!doesRoleHaveHighEnoughPermissions(
+			"unauthenticated",
+			pageToTest.minimumUserPrivilege ?? "unauthenticated",
+		)
+	) {
+		lighthouseTest.describe(`${pageToTest.name} Lighthouse tests`, () => {
+			lighthouseTest(
+				`${pageToTest.name} @desktop @lighthouse`,
+				doLighthouseTest(pageToTest, "desktop", true),
+			);
+			lighthouseTest(
+				`${pageToTest.name} @mobile @lighthouse`,
+				doLighthouseTest(pageToTest, "mobile", true),
+			);
+		});
+	}
 }

package/toCopy/tests/e2e/universal/index.mts

@@ -1,17 +1,17 @@
-import { PlaywrightTestConfig } from "@playwright/test";
 import { generateProjectsForAllBrowsers } from "@atomicsmash/test-utils";
-import { setupName, storageState } from "../../auth/index.js";
+import { PlaywrightTestConfig } from "@playwright/test";
+import { setupName, storageState } from "../../auth/index.mjs";
 
 export const projects = [
 	...generateProjectsForAllBrowsers({
 		name: "universal_tests_unauthenticated",
 		testDir: "./tests/e2e/universal",
-		testMatch: /.*unauthenticated\.test\.ts/,
+		testMatch: /.*\/unauthenticated\.test\.mts/,
 	}),
 	...generateProjectsForAllBrowsers({
 		name: "universal_tests_authenticated",
 		testDir: "./tests/e2e/universal",
-		testMatch: /.*authenticated\.test\.ts/,
+		testMatch: /.*\/authenticated\.test\.mts/,
 		dependencies: [setupName],
 		use: { storageState },
 	}),

package/toCopy/tests/e2e/universal/unauthenticated.test.mts

@@ -1,11 +1,51 @@
 import {
+	doLighthouseTest,
+	lighthouseTest,
 	checkPrivilegedPages,
 	checkForLoremIpsum,
+	doesRoleHaveHighEnoughPermissions,
 } from "@atomicsmash/test-utils";
 import { test, pagesToTest } from "../../playwright-utils.mjs";
 
-test(
-	"privileged pages of the site to ensure non-logged in users can't access them",
-	checkPrivilegedPages(pagesToTest),
+const pagesRequiringAuthentication = pagesToTest.filter(
+	(page) =>
+		// If a page requires any kind of login
+		!doesRoleHaveHighEnoughPermissions(
+			"unauthenticated",
+			page.minimumUserPrivilege ?? "unauthenticated",
+		),
 );
-test("No lingering lorem ipsum on the site", checkForLoremIpsum(pagesToTest));
+
+if (pagesRequiringAuthentication.length) {
+	test(
+		"privileged pages of the site to ensure non-logged in users can't access them",
+		checkPrivilegedPages(pagesRequiringAuthentication),
+	);
+}
+
+if (pagesToTest.length) {
+	test("No lingering lorem ipsum on the site", checkForLoremIpsum(pagesToTest));
+}
+
+lighthouseTest.describe.configure({ mode: "parallel", retries: 3 });
+for (const pageToTest of pagesToTest) {
+	if (
+		// If a page requires any kind of login
+		!doesRoleHaveHighEnoughPermissions(
+			"unauthenticated",
+			pageToTest.minimumUserPrivilege ?? "unauthenticated",
+		)
+	) {
+		continue;
+	}
+	lighthouseTest.describe(`${pageToTest.name} Lighthouse tests`, () => {
+		lighthouseTest(
+			`${pageToTest.name} @desktop @lighthouse`,
+			doLighthouseTest(pageToTest, "desktop", true),
+		);
+		lighthouseTest(
+			`${pageToTest.name} @mobile @lighthouse`,
+			doLighthouseTest(pageToTest, "mobile", true),
+		);
+	});
+}

package/toCopy/tests/playwright-utils.mts

@@ -19,9 +19,9 @@ export const test = base.extend<CustomFixtures>({
 export type TestFunctionType = Parameters<typeof base>[2];
 export { checkAccessibility } from "@atomicsmash/test-utils";
 
-export const pagesToTest = [
+export const pagesToTest: PageList = [
 	// hover over PageList to see the format required for each page
-] satisfies PageList;
+];
 
 // Used to set the WP version for WordPressAdminInteraction. Supports major dot minor syntax, or "latest"
 export const CURRENT_WORDPRESS_VERSION: ConstructorParameters<