From 53dfc38cee863c1d0103321823caa26edcf5d7e4 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Mon, 21 Dec 2020 21:36:43 +0100 Subject: [PATCH] swallow errors instead --- package.json | 13 +++++++------ packages/material-ui/src/RootRef/RootRef.js | 2 +- packages/material-ui/src/RootRef/RootRef.test.js | 10 ++++++++++ test/karma.conf.js | 1 - 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index be34025fcaae6c..90fcb5d8b305f6 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.11.0", + "version": "4.11.1", "private": true, "scripts": { "proptypes": "ts-node --skip-project ./scripts/generateProptypes.ts", @@ -33,13 +33,13 @@ "size:why": "size-limit --why packages/material-ui/build/index.js", "start": "yarn docs:dev", "test": "yarn lint && yarn typescript && yarn test:coverage", - "test:coverage": "cross-env INTERNAL=true NODE_ENV=test BABEL_ENV=coverage nyc mocha 'packages/**/*.test.js' 'docs/**/*.test.js' --exclude '**/node_modules/**' && nyc report -r lcovonly", - "test:coverage:html": "cross-env INTERNAL=true NODE_ENV=test BABEL_ENV=coverage nyc mocha 'packages/**/**/*.test.js' --exclude '**/node_modules/**' && nyc report --reporter=html", - "test:karma": "cross-env INTERNAL=true NODE_ENV=test karma start test/karma.conf.js", + "test:coverage": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc mocha 'packages/**/*.test.js' 'docs/**/*.test.js' --exclude '**/node_modules/**' && nyc report -r lcovonly", + "test:coverage:html": "cross-env NODE_ENV=test BABEL_ENV=coverage nyc mocha 'packages/**/**/*.test.js' --exclude '**/node_modules/**' && nyc report --reporter=html", + "test:karma": "cross-env NODE_ENV=test karma start test/karma.conf.js", "test:regressions": "yarn test:regressions:build && rimraf test/regressions/screenshots/chrome/* && vrtest run --config test/vrtest.config.js --record", "test:regressions:build": "webpack --config test/regressions/webpack.config.js", "test:umd": "node packages/material-ui/test/umd/run.js", - "test:unit": "cross-env INTERNAL=true NODE_ENV=test mocha 'packages/**/*.test.js' 'docs/**/*.test.js' 'scripts/**/*.test.js' --exclude '**/node_modules/**'", + "test:unit": "cross-env NODE_ENV=test mocha 'packages/**/*.test.js' 'docs/**/*.test.js' 'scripts/**/*.test.js' --exclude '**/node_modules/**'", "test:watch": "yarn test:unit --watch", "typescript": "lerna run --no-bail --parallel typescript" }, @@ -165,7 +165,8 @@ "**/@babel/runtime": "^7.10.2", "**/@babel/types": "^7.10.2", "**/hoist-non-react-statics": "^3.3.2", - "**/next/terser": "^4.1.2" + "**/next/terser": "^4.1.2", + "**/react-is": "^16.13.1" }, "nyc": { "include": [ diff --git a/packages/material-ui/src/RootRef/RootRef.js b/packages/material-ui/src/RootRef/RootRef.js index 5144f0db8b5f9b..63f32f7409dc66 100644 --- a/packages/material-ui/src/RootRef/RootRef.js +++ b/packages/material-ui/src/RootRef/RootRef.js @@ -66,7 +66,7 @@ class RootRef extends React.Component { render() { if (process.env.NODE_ENV !== 'production') { - if (!warnedOnce && process.env.INTERNAL !== 'true') { + if (!warnedOnce) { warnedOnce = true; console.warn( [ diff --git a/packages/material-ui/src/RootRef/RootRef.test.js b/packages/material-ui/src/RootRef/RootRef.test.js index 19b86e289343ce..4d898ce78cd6de 100644 --- a/packages/material-ui/src/RootRef/RootRef.test.js +++ b/packages/material-ui/src/RootRef/RootRef.test.js @@ -2,6 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { expect } from 'chai'; import { spy } from 'sinon'; +import { consoleWarnMock } from 'test/utils/consoleErrorMock'; import createMount from 'test/utils/createMount'; import RootRef from './RootRef'; @@ -11,6 +12,15 @@ describe('', () => { // StrictModeViolation: uses findDOMNode const mount = createMount({ strict: false }); + beforeEach(() => { + PropTypes.resetWarningCache(); + consoleWarnMock.spy(); + }); + + afterEach(() => { + consoleWarnMock.reset(); + }); + it('call rootRef function on mount and unmount', () => { const rootRef = spy(); const wrapper = mount( diff --git a/test/karma.conf.js b/test/karma.conf.js index 6bca2e87efabf9..decc304fde624d 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -55,7 +55,6 @@ module.exports = function setKarmaConfig(config) { 'process.env': { NODE_ENV: JSON.stringify('test'), CI: JSON.stringify(process.env.CI), - INTERNAL: JSON.stringify(process.env.INTERNAL), }, }), ],