From 6012f4bf222a1511e44e3f8693df2d61ee8212b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Mon, 17 Jun 2024 12:15:18 +0200 Subject: [PATCH] [test] Fix tests on CI (#42670) --- package.json | 2 +- packages-internal/test-utils/package.json | 2 +- .../src/withStyles/withStyles.test.js | 5 +- pnpm-lock.yaml | 63 +++++++++---------- 4 files changed, 34 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 4208390b115b6c..6589d751485b50 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "generate-codeowners": "node scripts/generateCodeowners.mjs", "canary:release": "tsx ./scripts/canaryRelease.mts", "nx_test_tc": "node test/cli.js", - "nx_test_coverage_ci": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=lcov mocha 'packages/**/*.test.{js,ts,tsx} 'packages-internal/**/*.test.{js,ts,tsx}'' 'docs/**/*.test.{js,ts,tsx}'", + "nx_test_coverage_ci": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=lcov mocha 'packages/**/*.test.{js,ts,tsx}' 'packages-internal/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}'", "nx_test_coverage_html": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=html mocha 'packages/**/*.test.{js,ts,tsx}' 'packages-internal/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}'", "nx_test_coverage": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=text mocha 'packages/**/*.test.{js,ts,tsx}' 'packages-internal/**/*.test.{js,ts,tsx}' 'docs/**/*.test.{js,ts,tsx}'", "nx_test_e2e_build": "webpack --config test/e2e/webpack.config.js", diff --git a/packages-internal/test-utils/package.json b/packages-internal/test-utils/package.json index bc5c0db05dc044..59fc9175839517 100644 --- a/packages-internal/test-utils/package.json +++ b/packages-internal/test-utils/package.json @@ -46,7 +46,7 @@ "enzyme": "^3.11.0", "format-util": "^1.0.5", "fs-extra": "^11.2.0", - "jsdom": "^24.1.0", + "jsdom": "^24.0.0", "lodash": "^4.17.21", "mocha": "^10.4.0", "playwright": "^1.44.1", diff --git a/packages/mui-styles/src/withStyles/withStyles.test.js b/packages/mui-styles/src/withStyles/withStyles.test.js index 04976f540d0998..7684f4c65a7be4 100644 --- a/packages/mui-styles/src/withStyles/withStyles.test.js +++ b/packages/mui-styles/src/withStyles/withStyles.test.js @@ -7,6 +7,7 @@ import Input from '@mui/material/Input'; import { createRenderer, screen } from '@mui/internal-test-utils'; import { isMuiElement } from '@mui/material/utils'; import { createTheme } from '@mui/material/styles'; +import { unstable_nested } from '@mui/private-theming'; import StylesProvider from '../StylesProvider'; import createGenerateClassName from '../createGenerateClassName'; import ThemeProvider from '../ThemeProvider'; @@ -364,13 +365,13 @@ describe('withStyles', () => { propsTheme = props.theme; return null; }); - const theme = {}; + const theme = { [unstable_nested]: false }; render( , ); - expect(propsTheme).to.equal(theme); + expect(propsTheme).to.deep.equal(theme); }); }); }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93253704d499c2..c9a39c0f74e05a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1030,8 +1030,8 @@ importers: specifier: ^11.2.0 version: 11.2.0 jsdom: - specifier: ^24.1.0 - version: 24.1.0 + specifier: ^24.0.0 + version: 24.0.0 lodash: specifier: ^4.17.21 version: 4.17.21 @@ -8166,8 +8166,8 @@ packages: resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==} engines: {node: '>= 6'} - http-proxy-agent@7.0.2: - resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} + http-proxy-agent@7.0.0: + resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==} engines: {node: '>= 14'} http-proxy@1.18.1: @@ -8182,8 +8182,8 @@ packages: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} - https-proxy-agent@7.0.4: - resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==} + https-proxy-agent@7.0.2: + resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==} engines: {node: '>= 14'} human-signals@2.1.0: @@ -8748,8 +8748,8 @@ packages: '@babel/preset-env': optional: true - jsdom@24.1.0: - resolution: {integrity: sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==} + jsdom@24.0.0: + resolution: {integrity: sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==} engines: {node: '>=18'} peerDependencies: canvas: ^2.11.2 @@ -9817,8 +9817,8 @@ packages: nullthrows@1.1.1: resolution: {integrity: sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==} - nwsapi@2.2.10: - resolution: {integrity: sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==} + nwsapi@2.2.7: + resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==} nx@19.3.0: resolution: {integrity: sha512-WILWiROUkZWwuPJ12tP24Z0NULPEhxFN9i55/fECuVXYaFtkg6FvEne9C4d4bRqhZPcbrz6WhHnzE3NhdjH7XQ==} @@ -11120,9 +11120,6 @@ packages: rrweb-cssom@0.6.0: resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==} - rrweb-cssom@0.7.0: - resolution: {integrity: sha512-KlSv0pm9kgQSRxXEMgtivPJ4h826YHsuob8pSHcfSZsSXGtvpEAie8S0AnXuObEJ7nhikOb4ahwxDm0H2yW17g==} - rst-selector-parser@2.2.3: resolution: {integrity: sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==} @@ -11822,8 +11819,8 @@ packages: resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==} engines: {node: '>=6'} - tough-cookie@4.1.4: - resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==} + tough-cookie@4.1.3: + resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==} engines: {node: '>=6'} tr46@0.0.3: @@ -12430,8 +12427,8 @@ packages: utf-8-validate: optional: true - ws@8.17.0: - resolution: {integrity: sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==} + ws@8.16.0: + resolution: {integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 @@ -14891,8 +14888,8 @@ snapshots: '@npmcli/agent@2.2.0': dependencies: agent-base: 7.1.0 - http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.4 + http-proxy-agent: 7.0.0 + https-proxy-agent: 7.0.2 lru-cache: 10.1.0 socks-proxy-agent: 8.0.2 transitivePeerDependencies: @@ -19341,7 +19338,7 @@ snapshots: gaxios@6.1.1(encoding@0.1.13): dependencies: extend: 3.0.2 - https-proxy-agent: 7.0.4 + https-proxy-agent: 7.0.2 is-stream: 2.0.1 node-fetch: 2.7.0(encoding@0.1.13) transitivePeerDependencies: @@ -19776,7 +19773,7 @@ snapshots: transitivePeerDependencies: - supports-color - http-proxy-agent@7.0.2: + http-proxy-agent@7.0.0: dependencies: agent-base: 7.1.0 debug: 4.3.4(supports-color@8.1.1) @@ -19805,7 +19802,7 @@ snapshots: transitivePeerDependencies: - supports-color - https-proxy-agent@7.0.4: + https-proxy-agent@7.0.2: dependencies: agent-base: 7.1.0 debug: 4.3.4(supports-color@8.1.1) @@ -20406,28 +20403,28 @@ snapshots: transitivePeerDependencies: - supports-color - jsdom@24.1.0: + jsdom@24.0.0: dependencies: cssstyle: 4.0.1 data-urls: 5.0.0 decimal.js: 10.4.3 form-data: 4.0.0 html-encoding-sniffer: 4.0.0 - http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.4 + http-proxy-agent: 7.0.0 + https-proxy-agent: 7.0.2 is-potential-custom-element-name: 1.0.1 - nwsapi: 2.2.10 + nwsapi: 2.2.7 parse5: 7.1.2 - rrweb-cssom: 0.7.0 + rrweb-cssom: 0.6.0 saxes: 6.0.0 symbol-tree: 3.2.4 - tough-cookie: 4.1.4 + tough-cookie: 4.1.3 w3c-xmlserializer: 5.0.0 webidl-conversions: 7.0.0 whatwg-encoding: 3.1.1 whatwg-mimetype: 4.0.0 whatwg-url: 14.0.0 - ws: 8.17.0 + ws: 8.16.0 xml-name-validator: 5.0.0 transitivePeerDependencies: - bufferutil @@ -21870,7 +21867,7 @@ snapshots: nullthrows@1.1.1: {} - nwsapi@2.2.10: {} + nwsapi@2.2.7: {} nx@19.3.0: dependencies: @@ -23369,8 +23366,6 @@ snapshots: rrweb-cssom@0.6.0: {} - rrweb-cssom@0.7.0: {} - rst-selector-parser@2.2.3: dependencies: lodash.flattendeep: 4.4.0 @@ -24277,7 +24272,7 @@ snapshots: totalist@3.0.1: {} - tough-cookie@4.1.4: + tough-cookie@4.1.3: dependencies: psl: 1.9.0 punycode: 2.3.1 @@ -24952,7 +24947,7 @@ snapshots: ws@8.11.0: {} - ws@8.17.0: {} + ws@8.16.0: {} xcase@2.0.1: {}