Skip to content

Commit 6a963a3

Browse files
committed
Replace Happy DOM with Vitest Browser Mode
1 parent dac3907 commit 6a963a3

File tree

9 files changed

+173
-98
lines changed

9 files changed

+173
-98
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252

5353
- name: Install dependencies
5454
run: yarn --immutable
55+
env:
56+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: true
5557

5658
- name: Build package
5759
run: yarn build
@@ -91,6 +93,15 @@ jobs:
9193
restore-keys: |
9294
${{ runner.os }}-${{ env.cache-name }}
9395
96+
- name: Cache ~/.cache/ms-playwright
97+
id: playwright-cache
98+
uses: actions/cache@v4
99+
env:
100+
cache-name: playwright-cache
101+
with:
102+
path: ~/.cache/ms-playwright
103+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
104+
94105
- name: Use Node.js
95106
uses: actions/setup-node@v4
96107
with:
@@ -102,5 +113,9 @@ jobs:
102113
- name: Install dependencies
103114
run: yarn --immutable
104115

116+
- name: Install Playwright browsers
117+
if: steps.playwright-cache.outputs.cache-hit != 'true'
118+
run: yarn workspace @wojtekmaj/react-datetimerange-picker playwright install chromium-headless-shell
119+
105120
- name: Run tests
106121
run: yarn unit

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
!**/.yarn/versions
1919

2020
# Project-generated directories and files
21+
__screenshots__
2122
coverage
2223
dist
2324
node_modules

.yarnrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
enableScripts: false
2+
13
logFilters:
24
- code: YN0076
35
level: discard

packages/react-datetimerange-picker/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@
6666
"@testing-library/dom": "^10.0.0",
6767
"@testing-library/jest-dom": "^6.0.0",
6868
"@testing-library/react": "^16.0.0",
69-
"@testing-library/user-event": "^14.5.0",
7069
"@types/node": "*",
7170
"@types/react": "*",
7271
"@types/react-dom": "*",
72+
"@vitest/browser": "^3.2.3",
7373
"cpy-cli": "^5.0.0",
74-
"happy-dom": "^15.10.2",
74+
"playwright": "^1.51.1",
7575
"react": "^18.2.0",
7676
"react-dom": "^18.2.0",
7777
"replace-in-files-cli": "^3.0.0",
7878
"typescript": "^5.5.2",
7979
"vitest": "^3.2.3",
80-
"vitest-canvas-mock": "^0.2.2"
80+
"vitest-browser-react": "^1.0.1"
8181
},
8282
"peerDependencies": {
8383
"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",

packages/react-datetimerange-picker/src/DateTimeRangePicker.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { userEvent } from '@vitest/browser/context';
12
import { describe, expect, it, vi } from 'vitest';
23
import { act, fireEvent, render, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
3-
import { userEvent } from '@testing-library/user-event';
44

55
import DateTimeRangePicker from './DateTimeRangePicker.js';
66

@@ -638,7 +638,7 @@ describe('DateTimeRangePicker', () => {
638638
it('closes Calendar component when clicked outside', async () => {
639639
const { container } = render(<DateTimeRangePicker isCalendarOpen />);
640640

641-
userEvent.click(document.body);
641+
await userEvent.click(document.body);
642642

643643
await waitForElementToBeRemovedOrHidden(() =>
644644
container.querySelector('.react-datetimerange-picker__calendar'),
@@ -668,7 +668,7 @@ describe('DateTimeRangePicker', () => {
668668
it('closes Clock component when clicked outside', async () => {
669669
const { container } = render(<DateTimeRangePicker isClockOpen />);
670670

671-
userEvent.click(document.body);
671+
await userEvent.click(document.body);
672672

673673
await waitForElementToBeRemovedOrHidden(() =>
674674
container.querySelector('.react-datetimerange-picker__clock'),

packages/react-datetimerange-picker/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"skipLibCheck": true,
1414
"strict": true,
1515
"target": "es2018",
16+
"types": ["@vitest/browser/matchers"],
1617
"verbatimModuleSyntax": true
1718
},
1819
"exclude": ["dist"]

packages/react-datetimerange-picker/vitest.config.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { defineConfig } from 'vitest/config';
22

33
export default defineConfig({
44
test: {
5-
environment: 'happy-dom',
6-
server: {
7-
deps: {
8-
inline: ['vitest-canvas-mock'],
9-
},
5+
browser: {
6+
enabled: true,
7+
headless: true,
8+
instances: [{ browser: 'chromium' }],
9+
provider: 'playwright',
1010
},
1111
setupFiles: 'vitest.setup.ts',
1212
watch: false,

packages/react-datetimerange-picker/vitest.setup.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { afterEach } from 'vitest';
22
import { cleanup } from '@testing-library/react';
33
import '@testing-library/jest-dom/vitest';
4-
import 'vitest-canvas-mock';
54

65
afterEach(() => {
76
cleanup();

0 commit comments

Comments
 (0)