diff --git a/browser/e2e/package.json b/browser/e2e/package.json index de08253fa..e64b7c9d8 100644 --- a/browser/e2e/package.json +++ b/browser/e2e/package.json @@ -13,7 +13,9 @@ }, "devDependencies": { "@playwright/test": "^1.48.1", - "@types/kill-port": "^2.0.3" + "@types/kill-port": "^2.0.3", + "@axe-core/playwright": "^4.10.1", + "kill-port": "^2.0.1" }, "scripts": { "playwright-install": "playwright install chromium", @@ -24,8 +26,5 @@ "test-new": "playwright codegen http://localhost:5173", "test-query": "PWDEBUG=1 DELETE_PREVIOUS_TEST_DRIVES=false playwright test \"e2e.spec.ts\" \"tables.spec.ts\" \"documents.spec.ts\" \"ontology.spec.ts\" \"search.spec.ts\" -g" }, - "dependencies": { - "@axe-core/playwright": "^4.10.1", - "kill-port": "^2.0.1" - } + "dependencies": {} } diff --git a/browser/e2e/tests/template.spec.ts b/browser/e2e/tests/template.spec.ts index ce85c88c3..58f303516 100644 --- a/browser/e2e/tests/template.spec.ts +++ b/browser/e2e/tests/template.spec.ts @@ -74,8 +74,6 @@ const waitForServer = ( childProcess.stdout?.on('data', data => { const message = data.toString(); - log(message); - const match = message.match(/http:\/\/localhost:\d+/); if (match) { @@ -160,6 +158,13 @@ test.describe('Create Next.js Template', () => { await expect(page.locator('body')).not.toContainText('coffee'); } finally { child.kill(); + kill(3000) + .then(() => { + log('Next.js server shut down successfully'); + }) + .catch(err => { + console.error('Failed to shut down Next.js server:', err); + }); } }); @@ -176,8 +181,6 @@ test.describe('Create Next.js Template', () => { } catch (error) { console.error(`Failed to delete ${TEMPLATE_DIR_NAME}:`, error); } - - await kill(3000); }); }); @@ -240,6 +243,13 @@ test.describe('Create SvelteKit Template', () => { await expect(page.locator('body')).not.toContainText('coffee'); } finally { child.kill(); + kill(4174) + .then(() => { + log('SvelteKit server shut down successfully'); + }) + .catch(err => { + console.error('Failed to shut down SvelteKit server:', err); + }); } }); @@ -256,7 +266,5 @@ test.describe('Create SvelteKit Template', () => { } catch (error) { console.error(`Failed to delete ${TEMPLATE_DIR_NAME}:`, error); } - - await kill(4173); }); }); diff --git a/browser/pnpm-lock.yaml b/browser/pnpm-lock.yaml index 16c96844a..2eba3ba62 100644 --- a/browser/pnpm-lock.yaml +++ b/browser/pnpm-lock.yaml @@ -304,20 +304,19 @@ importers: version: 3.9.5(vite@5.4.10(@types/node@20.17.0)(terser@5.36.0)) e2e: - dependencies: + devDependencies: '@axe-core/playwright': specifier: ^4.10.1 - version: 4.10.1(playwright-core@1.48.1) - kill-port: - specifier: ^2.0.1 - version: 2.0.1 - devDependencies: + version: 4.10.1(playwright-core@1.50.0) '@playwright/test': specifier: ^1.48.1 - version: 1.48.1 + version: 1.50.0 '@types/kill-port': specifier: ^2.0.3 version: 2.0.3 + kill-port: + specifier: ^2.0.1 + version: 2.0.1 lib: dependencies: @@ -2159,8 +2158,8 @@ packages: resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} - '@playwright/test@1.48.1': - resolution: {integrity: sha512-s9RtWoxkOLmRJdw3oFvhFbs9OJS0BzrLUc8Hf6l2UdCNd1rqeEyD4BhCJkvzeEoD1FsK4mirsWwGerhVmYKtZg==} + '@playwright/test@1.50.0': + resolution: {integrity: sha512-ZGNXbt+d65EGjBORQHuYKj+XhCewlwpnSd/EDuLPZGSiEWmgOJB5RmMCCYGy5aMfTs9wx61RivfDKi8H/hcMvw==} engines: {node: '>=18'} hasBin: true @@ -7306,13 +7305,13 @@ packages: pkg-types@1.2.1: resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==} - playwright-core@1.48.1: - resolution: {integrity: sha512-Yw/t4VAFX/bBr1OzwCuOMZkY1Cnb4z/doAFSwf4huqAGWmf9eMNjmK7NiOljCdLmxeRYcGPPmcDgU0zOlzP0YA==} + playwright-core@1.50.0: + resolution: {integrity: sha512-CXkSSlr4JaZs2tZHI40DsZUN/NIwgaUPsyLuOAaIZp2CyF2sN5MM5NJsyB188lFSSozFxQ5fPT4qM+f0tH/6wQ==} engines: {node: '>=18'} hasBin: true - playwright@1.48.1: - resolution: {integrity: sha512-j8CiHW/V6HxmbntOfyB4+T/uk08tBy6ph0MpBXwuoofkSnLmlfdYNNkFTYD6ofzzlSqLA1fwH4vwvVFvJgLN0w==} + playwright@1.50.0: + resolution: {integrity: sha512-+GinGfGTrd2IfX1TA4N2gNmeIksSb+IAe589ZH+FlmpV3MYTx6+buChGIuDLQwrGNCw2lWibqV50fU510N7S+w==} engines: {node: '>=18'} hasBin: true @@ -9483,10 +9482,10 @@ snapshots: typescript: 5.6.1-rc validate-npm-package-name: 5.0.1 - '@axe-core/playwright@4.10.1(playwright-core@1.48.1)': + '@axe-core/playwright@4.10.1(playwright-core@1.50.0)': dependencies: axe-core: 4.10.2 - playwright-core: 1.48.1 + playwright-core: 1.50.0 '@babel/code-frame@7.26.2': dependencies: @@ -11276,9 +11275,9 @@ snapshots: '@pkgr/core@0.1.1': {} - '@playwright/test@1.48.1': + '@playwright/test@1.50.0': dependencies: - playwright: 1.48.1 + playwright: 1.50.0 '@pnpm/config.env-replace@1.1.0': {} @@ -17279,11 +17278,11 @@ snapshots: mlly: 1.7.2 pathe: 1.1.2 - playwright-core@1.48.1: {} + playwright-core@1.50.0: {} - playwright@1.48.1: + playwright@1.50.0: dependencies: - playwright-core: 1.48.1 + playwright-core: 1.50.0 optionalDependencies: fsevents: 2.3.2