Skip to content

Commit b76ba89

Browse files
authored
Merge branch 'main' into users/janechu/convert-tests-to-playwright
2 parents 2e94521 + d0aa03d commit b76ba89

13 files changed

Lines changed: 144 additions & 264 deletions
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Convert fast-router tests from karma to playwright",
4+
"packageName": "@microsoft/fast-router",
5+
"email": "7559015+janechu@users.noreply.github.com",
6+
"dependentChangeType": "none"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Tag SSR prerelease with latest",
4+
"packageName": "@microsoft/fast-ssr",
5+
"email": "7559015+janechu@users.noreply.github.com",
6+
"dependentChangeType": "none"
7+
}

packages/fast-router/.mocharc.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/fast-router/karma.conf.cjs

Lines changed: 0 additions & 148 deletions
This file was deleted.

packages/fast-router/package.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,14 @@
2727
"doc:ci": "api-extractor run",
2828
"build": "tsc -p ./tsconfig.json && npm run doc",
2929
"dev": "tsc -p ./tsconfig.json -w",
30-
"tdd": "npm run dev & npm run test-chrome:watch",
3130
"prepublishOnly": "npm run clean:dist && npm run build",
3231
"prettier": "prettier --config ../../.prettierrc --write \"**/*.ts\"",
3332
"prettier:diff": "prettier --config ../../.prettierrc \"**/*.ts\" --list-different",
3433
"eslint": "eslint . --ext .ts",
3534
"eslint:fix": "eslint . --ext .ts --fix",
36-
"test": "npm run eslint && npm run test-chrome:verbose && npm run doc:ci",
37-
"test-node": "nyc --reporter=lcov --reporter=text-summary --report-dir=coverage/node --temp-dir=coverage/.nyc_output mocha --reporter min --exit dist/esm/__test__/setup-node.js './dist/esm/**/*.spec.js'",
38-
"test-node:verbose": "nyc --reporter=lcov --reporter=text-summary --report-dir=coverage/node --temp-dir=coverage/.nyc_output mocha --reporter spec --exit dist/esm/__test__/setup-node.js './dist/esm/**/*.spec.js'",
39-
"test-chrome": "karma start karma.conf.cjs --browsers=ChromeHeadlessOpt --single-run --coverage",
40-
"test-chrome:verbose": "karma start karma.conf.cjs --browsers=ChromeHeadlessOpt --single-run --coverage --reporter=mocha",
41-
"test-chrome:watch": "karma start karma.conf.cjs --browsers=ChromeHeadlessOpt --coverage --watch-extensions js",
42-
"test-chrome:debugger": "karma start karma.conf.cjs --browsers=ChromeDebugging",
43-
"test-chrome:verbose:watch": "karma start karma.conf.cjs --browsers=ChromeHeadlessOpt --coverage --watch-extensions js --reporter=mocha",
44-
"test-chrome:verbose:debugger": "karma start karma.conf.cjs --browsers=ChromeDebugging --reporter=mocha",
45-
"test-firefox": "karma start karma.conf.cjs --browsers=FirefoxHeadless --single-run --coverage",
46-
"test-firefox:verbose": "karma start karma.conf.cjs --browsers=FirefoxHeadless --single-run --coverage --reporter=mocha"
35+
"test:playwright": "playwright test",
36+
"test-server": "npx vite test/ --clearScreen false",
37+
"test": "npm run eslint && npm run doc:ci && npm run test:playwright"
4738
},
4839
"dependencies": {
4940
"tslib": "^2.6.3"
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { defineConfig, devices } from "@playwright/test";
2+
3+
export default defineConfig({
4+
testDir: ".",
5+
testMatch: "**/*.pw.spec.ts",
6+
retries: 3,
7+
// TODO: uncomment when further testing is added
8+
// see: https://github.com/microsoft/fast/pull/7276
9+
// projects: [
10+
// {
11+
// name: "chromium",
12+
// use: { ...devices["Desktop Chrome"] },
13+
// },
14+
// {
15+
// name: "firefox",
16+
// use: { ...devices["Desktop Firefox"] },
17+
// },
18+
// {
19+
// name: "webkit",
20+
// use: { ...devices["Desktop Safari"] },
21+
// },
22+
// ],
23+
// webServer: {
24+
// command: "npm run test-server",
25+
// port: 5173,
26+
// reuseExistingServer: true,
27+
// },
28+
});

packages/fast-router/src/__test__/setup-browser.cts

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/fast-router/src/__test__/setup-node.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)