Skip to content

Commit 1f23372

Browse files
renovate[bot]bernardobelchior
authored andcommitted
Upgrade to ^4.0.7. Fix configuration issues.
1 parent fe250c6 commit 1f23372

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+440
-562
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"@types/yargs": "^17.0.34",
9595
"@typescript-eslint/parser": "catalog:",
9696
"@vitejs/plugin-react": "catalog:",
97-
"@vitest/browser": "catalog:",
97+
"@vitest/browser-playwright": "catalog:",
9898
"@vitest/coverage-v8": "catalog:",
9999
"@vvago/vale": "^3.12.0",
100100
"axe-core": "4.11.0",

packages/eslint-plugin-mui-x/vitest.config.node.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ import { defineConfig } from 'vitest/config';
33
export default defineConfig({
44
test: {
55
environment: 'node',
6+
maxWorkers: 1,
67
},
78
});
Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { mergeConfig, defineConfig } from 'vitest/config';
32
import sharedConfig from '../../vitest.shared.mts';
43
import { getTestName } from '../../scripts/getTestName.mts';
54

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
...(process.env.PLAYWRIGHT_SERVER_WS
15-
? {
16-
connect: {
17-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
18-
},
19-
}
20-
: {}),
21-
},
22-
],
5+
export default mergeConfig(
6+
sharedConfig,
7+
defineConfig({
8+
test: {
9+
name: getTestName(import.meta.url),
10+
browser: {
11+
enabled: true,
12+
instances: [{ browser: 'chromium' }],
13+
},
2314
},
24-
},
25-
});
15+
}),
16+
);
Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { mergeConfig, defineConfig } from 'vitest/config';
32
import sharedConfig from '../../vitest.shared.mts';
43
import { getTestName } from '../../scripts/getTestName.mts';
54

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
...(process.env.PLAYWRIGHT_SERVER_WS
15-
? {
16-
connect: {
17-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
18-
},
19-
}
20-
: {}),
21-
},
22-
],
5+
export default mergeConfig(
6+
sharedConfig,
7+
defineConfig({
8+
test: {
9+
name: getTestName(import.meta.url),
10+
browser: {
11+
enabled: true,
12+
instances: [{ browser: 'chromium' }],
13+
},
2314
},
24-
},
25-
});
15+
}),
16+
);
Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { defineConfig, mergeConfig } from 'vitest/config';
32
import sharedConfig from '../../vitest.shared.mts';
43
import { getTestName } from '../../scripts/getTestName.mts';
54

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
},
15-
],
5+
export default mergeConfig(
6+
sharedConfig,
7+
defineConfig({
8+
test: {
9+
name: getTestName(import.meta.url),
10+
browser: {
11+
enabled: true,
12+
instances: [{ browser: 'chromium' }],
13+
},
1614
},
17-
},
18-
});
15+
}),
16+
);

packages/x-charts/src/hooks/useSeries.test.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ describe('useSeries', () => {
2222
'It looks like you rendered your component outside of a ChartDataProvider.';
2323
const errorMessage3 = 'The above error occurred in the <UseSeries> component:';
2424
const expectedError =
25-
reactMajor < 19
26-
? [errorMessage1, errorMessage2, errorMessage3]
27-
: [errorMessage1, errorMessage2].join('\n');
25+
reactMajor < 19 ? [errorMessage3] : [errorMessage1, errorMessage2].join('\n');
2826

2927
expect(() =>
3028
render(

packages/x-charts/src/hooks/useSvgRef.test.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { ErrorBoundary, createRenderer, reactMajor, screen } from '@mui/internal-test-utils';
2+
import { ErrorBoundary, createRenderer, screen } from '@mui/internal-test-utils';
33
import { isJSDOM } from 'test/utils/skipIf';
44
import { useSvgRef } from './useSvgRef';
55
import { ChartProvider } from '../context/ChartProvider';
@@ -21,12 +21,7 @@ describe('useSvgRef', () => {
2121
it.skipIf(!isJSDOM)('should throw an error when parent context not present', () => {
2222
const errorRef = React.createRef<any>();
2323

24-
const errorMessages = [
25-
'MUI X Charts: Could not find the Chart context.',
26-
'It looks like you rendered your component outside of a ChartDataProvider.',
27-
'The above error occurred in the <UseSvgRef> component',
28-
];
29-
const expectedError = reactMajor < 19 ? errorMessages : errorMessages.slice(0, 2).join('\n');
24+
const expectedError = ['The above error occurred in the <UseSvgRef> component'];
3025

3126
expect(() =>
3227
render(
Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
/// <reference types="@vitest/browser/providers/playwright" />
2-
import { mergeConfig } from 'vitest/config';
1+
import { mergeConfig, defineConfig } from 'vitest/config';
32
import sharedConfig from '../../vitest.shared.mts';
43
import { getTestName } from '../../scripts/getTestName.mts';
54

6-
export default mergeConfig(sharedConfig, {
7-
test: {
8-
name: getTestName(import.meta.url),
9-
browser: {
10-
enabled: true,
11-
instances: [
12-
{
13-
browser: 'chromium',
14-
...(process.env.PLAYWRIGHT_SERVER_WS
15-
? {
16-
connect: {
17-
wsEndpoint: process.env.PLAYWRIGHT_SERVER_WS,
18-
},
19-
}
20-
: {}),
21-
},
22-
],
5+
export default mergeConfig(
6+
sharedConfig,
7+
defineConfig({
8+
test: {
9+
name: getTestName(import.meta.url),
10+
browser: {
11+
enabled: true,
12+
instances: [{ browser: 'chromium' }],
13+
},
2314
},
24-
},
25-
});
15+
}),
16+
);

packages/x-data-grid-premium/src/tests/columns.DataGridPremium.test.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('<DataGridPremium /> - Columns', () => {
99
describe('resizing', () => {
1010
// https://github.com/mui/mui-x/issues/10078
1111
// Needs layout
12-
it.skipIf(isJSDOM)('should properly resize aggregated column', () => {
12+
it.skipIf(isJSDOM)('should properly resize aggregated column', async () => {
1313
render(
1414
<div style={{ width: 300, height: 300 }}>
1515
<DataGridPremium
@@ -30,6 +30,9 @@ describe('<DataGridPremium /> - Columns', () => {
3030
</div>,
3131
);
3232

33+
// Fixes act warning
34+
await act(() => Promise.resolve());
35+
3336
const separator = document.querySelector(`.${gridClasses['columnSeparator--resizable']}`)!;
3437
fireEvent.mouseDown(separator, { clientX: 100 });
3538
fireEvent.mouseMove(separator, { clientX: 150, buttons: 1 });

packages/x-data-grid-premium/src/tests/rowSpanning.DataGridPremium.test.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createRenderer } from '@mui/internal-test-utils';
1+
import { act, createRenderer } from '@mui/internal-test-utils';
22
import { DataGridPremium, DataGridPremiumProps } from '@mui/x-data-grid-premium';
33
import { isJSDOM } from 'test/utils/skipIf';
44

@@ -106,7 +106,7 @@ describe('<DataGridPremium /> - Row spanning', () => {
106106
}
107107

108108
// See https://github.com/mui/mui-x/issues/14691
109-
it.skipIf(isJSDOM)('should not throw when initializing an aggregation model', () => {
109+
it.skipIf(isJSDOM)('should not throw when initializing an aggregation model', async () => {
110110
expect(() =>
111111
render(
112112
<TestDataGrid
@@ -121,5 +121,8 @@ describe('<DataGridPremium /> - Row spanning', () => {
121121
/>,
122122
),
123123
).not.toErrorDev();
124+
125+
// Fixes act warning
126+
await act(() => Promise.resolve());
124127
});
125128
});

0 commit comments

Comments
 (0)