chore: make tests os agnostic

Author: lifeiscontent

.github/workflows/tests.yml

@@ -1,61 +1,45 @@
-name: Tests
 on:
   push:
-    branches:
-      - main
-      - next
-      - v1
+    branches: [main, next, v1]
   pull_request:
-    branches:
-      - main
-      - next
-      - v1
+    branches: [main, next, v1]
 jobs:
-  unit:
-    name: API Tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-      - name: Download deps
-        run: pnpm i
-      - name: Build packages
-        run: pnpm run build
-      - name: Run tests
-        run: pnpm exec vitest
-      - name: Typecheck
-        run: pnpm -r run typecheck
-
   e2e:
     name: E2E Tests
+    timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-      - name: Setup node
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 20
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-      - name: Download deps
+          node-version: lts/*
+      - name: Enable Corepack
+        run: corepack enable
+      - name: Install dependencies
         run: pnpm i
-      - name: Install Playwright
+      - name: Install Playwright Browsers
         run: pnpm exec playwright install --with-deps
-      - name: Run tests
+      - name: Run Playwright tests
         run: pnpm exec playwright test
-      - name: Upload test result
-        uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-results
-          path: test-results/
+          name: playwright-report
+          path: playwright-report/
           retention-days: 30
+  unit:
+    name: API Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+      - name: Enable Corepack
+        run: corepack enable
+      - name: Install dependencies
+        run: pnpm i
+      - name: Run Vitest tests
+        run: pnpm exec vitest
+      - name: Run Typecheck
+        run: pnpm -r run typecheck

.gitignore

@@ -1,6 +1,6 @@
 # Logs
-logs
 *.log
+logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
@@ -9,20 +9,20 @@ yarn-error.log*
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 
 # Runtime data
-pids
 *.pid
-*.seed
 *.pid.lock
+*.seed
+pids
 
 # Build result
-/packages/*/*.js
 !/packages/*/rollup.config.js
+/packages/*/_virtual
 /packages/*/*.cjs
-/packages/*/*.mjs
 /packages/*/*.d.ts
-/packages/*/README
+/packages/*/*.js
+/packages/*/*.mjs
 /packages/*/LICENSE
-/packages/*/_virtual
+/packages/*/README
 
 # Anything built
 build/
@@ -41,10 +41,9 @@ node_modules/
 
 # Output of 'npm pack'
 *.tgz
-/test-results/
 /playwright-report/
 /playwright/.cache/
+/test-results/
 
 # DS Store
 .DS_Store
-**/.DS_Store

tests/integrations/async-validation.spec.ts renamed to e2e/async-validation.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground, selectAll } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {
@@ -74,7 +74,7 @@ async function runTest(page: Page, javaScriptEnabled: boolean) {
 		'Title is required',
 	]);
 
-	await fieldset.email.press('Control+a');
+	await selectAll(fieldset.email);
 	await fieldset.email.press('ArrowRight');
 	await fieldset.email.type('u');
 	if (!javaScriptEnabled) {
@@ -86,7 +86,7 @@ async function runTest(page: Page, javaScriptEnabled: boolean) {
 		'Title is required',
 	]);
 
-	await fieldset.email.press('Control+a');
+	await selectAll(fieldset.email);
 	await fieldset.email.press('ArrowRight');
 	await fieldset.email.type('i');
 	if (!javaScriptEnabled) {
@@ -98,7 +98,7 @@ async function runTest(page: Page, javaScriptEnabled: boolean) {
 		'Title is required',
 	]);
 
-	await fieldset.email.press('Control+a');
+	await selectAll(fieldset.email);
 	await fieldset.email.press('ArrowRight');
 	await fieldset.email.type('d');
 	if (!javaScriptEnabled) {
@@ -117,7 +117,7 @@ async function runTest(page: Page, javaScriptEnabled: boolean) {
 
 	await expect(playground.error).toHaveText(['Email is already used', '']);
 
-	await fieldset.email.press('Control+a');
+	await selectAll(fieldset.email);
 	await fieldset.email.press('ArrowRight');
 	await fieldset.email.type('e');
 	await playground.submit.click();

tests/integrations/collection.spec.ts renamed to e2e/collection.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 async function runTest(
 	page: Page,

tests/integrations/conform-validitystate.spec.ts renamed to e2e/conform-validitystate.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 async function setupField(page: Page, constraint: object, secret?: any) {
 	const playground = getPlayground(page);

tests/integrations/custom-inputs.spec.ts renamed to e2e/custom-inputs.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 async function runTest(page: Page) {
 	const playground = getPlayground(page);

tests/integrations/dom-value.spec.ts renamed to e2e/dom-value.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {

tests/integrations/file-upload.spec.ts renamed to e2e/file-upload.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {

tests/integrations/form-attributes.spec.ts renamed to e2e/form-attributes.spec.ts

@@ -1,5 +1,5 @@
 import { type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {

tests/integrations/form-control.spec.ts renamed to e2e/form-control.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {

e2e/helpers.ts

@@ -0,0 +1,46 @@
+import type { Locator, Page } from '@playwright/test';
+
+export function getPlayground(page: Page) {
+	const container = page.locator('body');
+	const submission = container.locator('pre');
+
+	return {
+		container,
+		form: container.locator('form'),
+		submit: container.locator('footer button[type="submit"]'),
+		reset: container.locator('footer button[type="reset"]'),
+		submission,
+		result: () => submission.innerText().then(JSON.parse),
+		error: container.locator('main p'),
+	};
+}
+
+export async function selectAll(locator: Locator) {
+	switch (process.platform) {
+		case 'darwin':
+			await locator.press('Meta+a');
+			break;
+		default:
+			await locator.press('Control+a');
+	}
+}
+
+export async function cut(locator: Locator) {
+	switch (process.platform) {
+		case 'darwin':
+			await locator.press('Meta+x');
+			break;
+		default:
+			await locator.press('Control+x');
+	}
+}
+
+export async function paste(locator: Locator) {
+	switch (process.platform) {
+		case 'darwin':
+			await locator.press('Meta+v');
+			break;
+		default:
+			await locator.press('Control+v');
+	}
+}

tests/integrations/input-attributes.spec.ts renamed to e2e/input-attributes.spec.ts

@@ -1,5 +1,5 @@
 import { type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {

tests/integrations/input-event.spec.ts renamed to e2e/input-event.spec.ts

@@ -1,4 +1,5 @@
 import { type Page, test, expect } from '@playwright/test';
+import { cut, paste, selectAll } from './helpers';
 
 async function getForm(
 	page: Page,
@@ -125,7 +126,7 @@ test('works with keyboard events', async ({ page }) => {
 	];
 
 	// Cut out 'c'
-	await form.nativeInput.press('Control+x');
+	await cut(form.nativeInput);
 	await expect(form.nativeLogs).toHaveText(logs2);
 	await expect(form.baseLogs).toHaveText(logs2);
 
@@ -145,7 +146,7 @@ test('works with keyboard events', async ({ page }) => {
 	];
 
 	// Paste the 'c' back
-	await form.nativeInput.press('Control+v');
+	await paste(form.nativeInput);
 	await expect(form.nativeLogs).toHaveText(logs3);
 	await expect(form.baseLogs).toHaveText(logs3);
 
@@ -164,8 +165,7 @@ test('works with keyboard events', async ({ page }) => {
 		createLog('change', 3),
 	];
 
-	// Select all text
-	await form.nativeInput.press('Control+a');
+	await selectAll(form.nativeInput);
 	await expect(form.nativeLogs).toHaveText(logs4);
 	await expect(form.baseLogs).toHaveText(logs4);
 

tests/integrations/metadata.spec.ts renamed to e2e/metadata.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	const list = form.locator('fieldset');

tests/integrations/nested-list.spec.ts renamed to e2e/nested-list.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {

tests/integrations/parse-with-yup.spec.ts renamed to e2e/parse-with-yup.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground, selectAll } from './helpers';
 
 function getUsernameInput(container: Locator) {
 	return container.locator('[name="username"]');
@@ -22,7 +22,7 @@ async function runTest(page: Page) {
 		'At least 1 number',
 	]);
 
-	await username.press('Control+a');
+	await selectAll(username);
 	await username.press('ArrowRight');
 	await username.type('C');
 
@@ -33,7 +33,7 @@ async function runTest(page: Page) {
 		'At least 1 number',
 	]);
 
-	await username.press('Control+a');
+	await selectAll(username);
 	await username.press('ArrowRight');
 	await username.type('on');
 	await playground.submit.click();
@@ -42,13 +42,13 @@ async function runTest(page: Page) {
 		'At least 1 number',
 	]);
 
-	await username.press('Control+a');
+	await selectAll(username);
 	await username.press('ArrowRight');
 	await username.type('form');
 	await playground.submit.click();
 	await expect(playground.error).toHaveText(['At least 1 number']);
 
-	await username.press('Control+a');
+	await selectAll(username);
 	await username.press('ArrowRight');
 	await username.type('2023');
 	await playground.submit.click();

tests/integrations/recursive-list.spec.ts renamed to e2e/recursive-list.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {

tests/integrations/reset-default-value.spec.ts renamed to e2e/reset-default-value.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {

tests/integrations/simple-list.spec.ts renamed to e2e/simple-list.spec.ts

@@ -1,5 +1,5 @@
 import { type Page, type Locator, test, expect } from '@playwright/test';
-import { getPlayground } from '../helpers';
+import { getPlayground } from './helpers';
 
 function getFieldset(form: Locator) {
 	return {