Skip to content

Commit c677b1d

Browse files
LukasTyJCQuintas
andauthored
[infra] Improve test setup (#18228)
Co-authored-by: Jose C Quintas Jr <[email protected]>
1 parent 2049db8 commit c677b1d

File tree

6 files changed

+12
-4
lines changed

6 files changed

+12
-4
lines changed

packages/x-date-pickers-pro/vitest.config.browser.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export default mergeConfig(sharedConfig, {
77
test: {
88
name: getTestName(import.meta.url),
99
environment: 'browser',
10+
setupFiles: [new URL('../../test/utils/setupPickers.js', import.meta.url).pathname],
1011
browser: {
1112
enabled: true,
1213
instances: [

packages/x-date-pickers-pro/vitest.config.jsdom.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ export default mergeConfig(sharedConfig, {
66
test: {
77
name: getTestName(import.meta.url),
88
environment: 'jsdom',
9+
setupFiles: [new URL('../../test/utils/setupPickers.js', import.meta.url).pathname],
910
},
1011
});

packages/x-date-pickers/vitest.config.browser.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export default mergeConfig(sharedConfig, {
1818
test: {
1919
name: getTestName(import.meta.url),
2020
environment: 'browser',
21+
setupFiles: [new URL('../../test/utils/setupPickers.js', import.meta.url).pathname],
2122
browser: {
2223
enabled: true,
2324
instances: [

packages/x-date-pickers/vitest.config.jsdom.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ export default mergeConfig(sharedConfig, {
2424
test: {
2525
name: getTestName(import.meta.url),
2626
environment: 'jsdom',
27+
setupFiles: [new URL('../../test/utils/setupPickers.js', import.meta.url).pathname],
2728
},
2829
});

test/setupVitest.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { beforeAll, afterAll } from 'vitest';
22
import 'test/utils/addChaiAssertions';
3-
import 'test/utils/setupPickers';
43
import 'test/utils/licenseRelease';
54
import { generateTestLicenseKey, setupTestLicenseKey } from 'test/utils/testLicense';
65
import { configure } from '@mui/internal-test-utils';
@@ -58,10 +57,8 @@ if (!globalThis.after) {
5857
(globalThis as any).after = afterAll;
5958
}
6059

61-
const isJsdom = typeof window !== 'undefined' && window.navigator.userAgent.includes('jsdom');
62-
6360
// Only necessary when not in browser mode.
64-
if (isJsdom) {
61+
if (isJSDOM) {
6562
class Touch {
6663
instance: any;
6764

vitest.shared.mts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,13 @@ export default defineConfig({
7979
provider: 'playwright',
8080
headless: true,
8181
screenshotFailures: false,
82+
orchestratorScripts: [
83+
{
84+
id: 'vitest-reload-on-error',
85+
content: `window.addEventListener('vite:preloadError', (event) => { window.location.reload(); });`,
86+
async: true,
87+
},
88+
],
8289
},
8390
// Disable isolation to speed up the tests.
8491
isolate: false,

0 commit comments

Comments
 (0)