Skip to content

Commit

Permalink
[core] Fix CI on v5.x branch (#44487)
Browse files Browse the repository at this point in the history
  • Loading branch information
DiegoAndai authored Nov 21, 2024
1 parent f6181da commit a66018b
Show file tree
Hide file tree
Showing 7 changed files with 122 additions and 143 deletions.
1 change: 0 additions & 1 deletion docs/src/components/home/SponsorCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import Paper from '@mui/material/Paper';
import LaunchRounded from '@mui/icons-material/LaunchRounded';
import { Link } from '@mui/docs/Link';

export default function SponsorCard(props: {
item: {
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"test:regressions:run": "mocha --config test/regressions/.mocharc.js --delay 'test/regressions/**/*.test.js'",
"test:regressions:server": "serve test/regressions -p 5001",
"test:umd": "node packages/mui-material/test/umd/run.js",
"test:unit": "cross-env NODE_ENV=test mocha 'packages/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}'",
"test:unit": "cross-env NODE_ENV=test BROWSERSLIST_IGNORE_OLD_DATA=true mocha 'packages/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}'",
"test:argos": "node ./scripts/pushArgos.mjs",
"typescript": "lerna run --no-bail --parallel typescript",
"typescript:ci": "lerna run --concurrency 3 --no-bail --no-sort typescript",
Expand All @@ -84,8 +84,8 @@
},
"dependencies": {
"@googleapis/sheets": "^5.0.5",
"@slack/bolt": "^3.17.1",
"@netlify/functions": "^2.6.0",
"@slack/bolt": "^3.17.1",
"execa": "^8.0.1",
"google-auth-library": "^9.7.0"
},
Expand All @@ -105,17 +105,17 @@
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@babel/register": "^7.23.7",
"@mui/internal-docs-utils": "workspace:^",
"@mui/internal-scripts": "workspace:^",
"@mui-internal/api-docs-builder": "workspace:^",
"@mui-internal/api-docs-builder-core": "workspace:^",
"@mui-internal/test-utils": "workspace:^",
"@mui/internal-docs-utils": "workspace:^",
"@mui/internal-scripts": "workspace:^",
"@mui/joy": "workspace:*",
"@mui/material": "workspace:^",
"@mui/utils": "workspace:^",
"@pigment-css/react": "workspace:^",
"@next/eslint-plugin-next": "^14.1.3",
"@octokit/rest": "^20.0.2",
"@pigment-css/react": "workspace:^",
"@playwright/test": "1.42.1",
"@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.17.0",
Expand Down Expand Up @@ -191,9 +191,9 @@
"webpack-cli": "^5.1.4",
"yargs": "^17.7.2"
},
"packageManager": "pnpm@9.4.0",
"packageManager": "pnpm@9.13.2",
"engines": {
"pnpm": "9.4.0"
"pnpm": "9.13.2"
},
"resolutions": {
"@babel/core": "^7.23.9",
Expand Down
1 change: 0 additions & 1 deletion packages/mui-base/src/Select/Select.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,6 @@ describe('<Select />', () => {
const selectButton = getByTestId('select');

act(() => updateButton.click());
act(() => selectButton.click());

const option2 = getByText('2');
act(() => option2.click());
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/Tabs/Tabs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function hasRightScrollButton(container) {

describe('<Tabs />', () => {
// tests mocking getBoundingClientRect prevent mocha to exit
const isJSDOM = navigator.userAgent === 'node.js';
const isJSDOM = /jsdom/.test(window.navigator.userAgent);

const { clock, render, renderToString } = createRenderer();

Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/internal/animate.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('animate', () => {

before(function beforeHook() {
const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
const isJSDOM = navigator.userAgent === 'node.js';
const isJSDOM = /jsdom/.test(window.navigator.userAgent);
if (isJSDOM || isSafari) {
// The test fails on Safari with just:
//
Expand Down
4 changes: 0 additions & 4 deletions packages/test-utils/src/createDOM.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ function createDOM() {
}
global.window.Touch = Touch;

global.navigator = {
userAgent: 'node.js',
};

Object.keys(dom.window)
.filter((key) => !blacklist.includes(key))
.concat(whitelist)
Expand Down
Loading

0 comments on commit a66018b

Please sign in to comment.