diff --git a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js index cfbb7ceef6f9b1..3b124941d7f159 100644 --- a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js +++ b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js @@ -697,7 +697,7 @@ describe('ReactComponentLifeCycle', () => { expect(() => ReactDOM.render(, container)).toErrorDev( 'Unsafe legacy lifecycles will not be called for components using new component APIs.', ); - }).toLowPriorityWarnDev( + }).toWarnDev( [ 'componentWillMount has been renamed', 'componentWillReceiveProps has been renamed', @@ -735,7 +735,7 @@ describe('ReactComponentLifeCycle', () => { ).toErrorDev( 'Unsafe legacy lifecycles will not be called for components using new component APIs.', ); - }).toLowPriorityWarnDev( + }).toWarnDev( [ 'componentWillMount has been renamed', 'componentWillReceiveProps has been renamed', @@ -803,7 +803,7 @@ describe('ReactComponentLifeCycle', () => { 'The above lifecycles should be removed. Learn more about this warning here:\n' + 'https://fb.me/react-unsafe-component-lifecycles', ); - }).toLowPriorityWarnDev( + }).toWarnDev( [ 'componentWillMount has been renamed', 'componentWillUpdate has been renamed', @@ -853,7 +853,7 @@ describe('ReactComponentLifeCycle', () => { 'The above lifecycles should be removed. Learn more about this warning here:\n' + 'https://fb.me/react-unsafe-component-lifecycles', ); - }).toLowPriorityWarnDev(['componentWillMount has been renamed'], { + }).toWarnDev(['componentWillMount has been renamed'], { withoutStack: true, }); @@ -876,7 +876,7 @@ describe('ReactComponentLifeCycle', () => { 'The above lifecycles should be removed. Learn more about this warning here:\n' + 'https://fb.me/react-unsafe-component-lifecycles', ); - }).toLowPriorityWarnDev(['componentWillReceiveProps has been renamed'], { + }).toWarnDev(['componentWillReceiveProps has been renamed'], { withoutStack: true, }); }); @@ -908,7 +908,7 @@ describe('ReactComponentLifeCycle', () => { 'The above lifecycles should be removed. Learn more about this warning here:\n' + 'https://fb.me/react-unsafe-component-lifecycles', ); - }).toLowPriorityWarnDev( + }).toWarnDev( [ 'componentWillMount has been renamed', 'componentWillUpdate has been renamed', @@ -956,7 +956,7 @@ describe('ReactComponentLifeCycle', () => { 'The above lifecycles should be removed. Learn more about this warning here:\n' + 'https://fb.me/react-unsafe-component-lifecycles', ); - }).toLowPriorityWarnDev(['componentWillMount has been renamed'], { + }).toWarnDev(['componentWillMount has been renamed'], { withoutStack: true, }); @@ -978,7 +978,7 @@ describe('ReactComponentLifeCycle', () => { 'The above lifecycles should be removed. Learn more about this warning here:\n' + 'https://fb.me/react-unsafe-component-lifecycles', ); - }).toLowPriorityWarnDev(['componentWillReceiveProps has been renamed'], { + }).toWarnDev(['componentWillReceiveProps has been renamed'], { withoutStack: true, }); }); @@ -1111,9 +1111,7 @@ describe('ReactComponentLifeCycle', () => { } const div = document.createElement('div'); - expect(() => - ReactDOM.render(, div), - ).toLowPriorityWarnDev( + expect(() => ReactDOM.render(, div)).toWarnDev( [ 'componentWillMount has been renamed', 'componentWillReceiveProps has been renamed', @@ -1382,9 +1380,7 @@ describe('ReactComponentLifeCycle', () => { } const container = document.createElement('div'); - expect(() => - ReactDOM.render(, container), - ).toLowPriorityWarnDev( + expect(() => ReactDOM.render(, container)).toWarnDev( [ /* eslint-disable max-len */ `Warning: componentWillMount has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details. diff --git a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js index 7f6eb77d717cd5..5994813d69f278 100644 --- a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js +++ b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js @@ -165,7 +165,7 @@ describe('ReactCompositeComponent', () => { // Old API based on heuristic let container = document.createElement('div'); container.innerHTML = markup; - expect(() => ReactDOM.render(, container)).toLowPriorityWarnDev( + expect(() => ReactDOM.render(, container)).toWarnDev( 'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' + 'will stop working in React v17. Replace the ReactDOM.render() call ' + 'with ReactDOM.hydrate() if you want React to attach to the server HTML.', diff --git a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js index 22d465bb555556..59d9b5a1fc381f 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFiber-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFiber-test.js @@ -257,7 +257,7 @@ describe('ReactDOMFiber', () => { , container, ), - ).toLowPriorityWarnDev( + ).toWarnDev( 'The ReactDOM.unstable_createPortal() alias has been deprecated, ' + 'and will be removed in React 17+. Update your code to use ' + 'ReactDOM.createPortal() instead. It has the exact same API, ' + diff --git a/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.js b/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.js index 84dcddaaca482f..497bf0e3b726ae 100644 --- a/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMServerLifecycles-test.js @@ -225,9 +225,9 @@ describe('ReactDOMServerLifecycles', () => { } } - expect(() => - ReactDOMServer.renderToString(), - ).toLowPriorityWarnDev('componentWillMount has been renamed'); + expect(() => ReactDOMServer.renderToString()).toWarnDev( + 'componentWillMount has been renamed', + ); expect(log).toEqual(['componentWillMount', 'UNSAFE_componentWillMount']); }); @@ -279,9 +279,9 @@ describe('ReactDOMServerLifecycles', () => { } } - expect(() => - ReactDOMServer.renderToString(), - ).toLowPriorityWarnDev('componentWillMount has been renamed'); + expect(() => ReactDOMServer.renderToString()).toWarnDev( + 'componentWillMount has been renamed', + ); }); it('should warn about deprecated lifecycle hooks', () => { @@ -292,9 +292,9 @@ describe('ReactDOMServerLifecycles', () => { } } - expect(() => - ReactDOMServer.renderToString(), - ).toLowPriorityWarnDev('componentWillMount has been renamed'); + expect(() => ReactDOMServer.renderToString()).toWarnDev( + 'componentWillMount has been renamed', + ); // De-duped ReactDOMServer.renderToString(); diff --git a/packages/react-dom/src/__tests__/ReactRenderDocument-test.js b/packages/react-dom/src/__tests__/ReactRenderDocument-test.js index 46053af708d43b..a85d86475679c1 100644 --- a/packages/react-dom/src/__tests__/ReactRenderDocument-test.js +++ b/packages/react-dom/src/__tests__/ReactRenderDocument-test.js @@ -35,7 +35,7 @@ describe('rendering React components at document', () => { describe('with old implicit hydration API', () => { function expectDeprecationWarningWithFiber(callback) { - expect(callback).toLowPriorityWarnDev( + expect(callback).toWarnDev( 'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' + 'will stop working in React v17. Replace the ReactDOM.render() call ' + 'with ReactDOM.hydrate() if you want React to attach to the server HTML.', @@ -197,7 +197,7 @@ describe('rendering React components at document', () => { expect(() => { expect(() => ReactDOM.render(, testDocument), - ).toLowPriorityWarnDev( + ).toWarnDev( 'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' + 'will stop working in React v17. Replace the ReactDOM.render() call ' + 'with ReactDOM.hydrate() if you want React to attach to the server HTML.', diff --git a/packages/react-dom/src/__tests__/ReactServerRenderingHydration-test.js b/packages/react-dom/src/__tests__/ReactServerRenderingHydration-test.js index f50d3a2e882732..1dcc050de96c21 100644 --- a/packages/react-dom/src/__tests__/ReactServerRenderingHydration-test.js +++ b/packages/react-dom/src/__tests__/ReactServerRenderingHydration-test.js @@ -81,7 +81,7 @@ describe('ReactDOMServerHydration', () => { expect(() => { instance = ReactDOM.render(, element); - }).toLowPriorityWarnDev( + }).toWarnDev( 'render(): Calling ReactDOM.render() to hydrate server-rendered markup ' + 'will stop working in React v17. Replace the ReactDOM.render() call ' + 'with ReactDOM.hydrate() if you want React to attach to the server HTML.', @@ -355,12 +355,12 @@ describe('ReactDOMServerHydration', () => { const element = document.createElement('div'); expect(() => { element.innerHTML = ReactDOMServer.renderToString(markup); - }).toLowPriorityWarnDev('componentWillMount has been renamed'); + }).toWarnDev('componentWillMount has been renamed'); expect(element.textContent).toBe('Hi'); expect(() => { ReactDOM.hydrate(markup, element); - }).toLowPriorityWarnDev('componentWillMount has been renamed', { + }).toWarnDev('componentWillMount has been renamed', { withoutStack: true, }); expect(element.textContent).toBe('Hi'); diff --git a/packages/react-dom/src/__tests__/ReactTestUtils-test.js b/packages/react-dom/src/__tests__/ReactTestUtils-test.js index 687dbd1aaec2c8..829010d97823aa 100644 --- a/packages/react-dom/src/__tests__/ReactTestUtils-test.js +++ b/packages/react-dom/src/__tests__/ReactTestUtils-test.js @@ -53,9 +53,7 @@ describe('ReactTestUtils', () => { MockedComponent.prototype.render = jest.fn(); // Patch it up so it returns its children. - expect(() => - ReactTestUtils.mockComponent(MockedComponent), - ).toLowPriorityWarnDev( + expect(() => ReactTestUtils.mockComponent(MockedComponent)).toWarnDev( 'ReactTestUtils.mockComponent() is deprecated. ' + 'Use shallow rendering or jest.mock() instead.\n\n' + 'See https://fb.me/test-utils-mock-component for more information.', diff --git a/packages/react/src/__tests__/ReactES6Class-test.js b/packages/react/src/__tests__/ReactES6Class-test.js index 46f85cb108f006..17186a3fe6118f 100644 --- a/packages/react/src/__tests__/ReactES6Class-test.js +++ b/packages/react/src/__tests__/ReactES6Class-test.js @@ -521,15 +521,11 @@ describe('ReactES6Class', () => { it('should throw AND warn when trying to access classic APIs', () => { const instance = test(, 'DIV', 'foo'); - expect(() => - expect(() => instance.replaceState({})).toThrow(), - ).toLowPriorityWarnDev( + expect(() => expect(() => instance.replaceState({})).toThrow()).toWarnDev( 'replaceState(...) is deprecated in plain JavaScript React classes', {withoutStack: true}, ); - expect(() => - expect(() => instance.isMounted()).toThrow(), - ).toLowPriorityWarnDev( + expect(() => expect(() => instance.isMounted()).toThrow()).toWarnDev( 'isMounted(...) is deprecated in plain JavaScript React classes', {withoutStack: true}, ); diff --git a/packages/react/src/__tests__/ReactElementValidator-test.internal.js b/packages/react/src/__tests__/ReactElementValidator-test.internal.js index 9fc0ab426ba5e8..295af13f987be7 100644 --- a/packages/react/src/__tests__/ReactElementValidator-test.internal.js +++ b/packages/react/src/__tests__/ReactElementValidator-test.internal.js @@ -439,7 +439,7 @@ describe('ReactElementValidator', () => { } let TestFactory = React.createFactory(TestComponent); - expect(() => TestFactory.type).toLowPriorityWarnDev( + expect(() => TestFactory.type).toWarnDev( 'Warning: Factory.type is deprecated. Access the class directly before ' + 'passing it to createFactory.', {withoutStack: true}, diff --git a/packages/react/src/__tests__/ReactStrictMode-test.js b/packages/react/src/__tests__/ReactStrictMode-test.js index 00c4b0b393ee93..3f7cde6ec585b7 100644 --- a/packages/react/src/__tests__/ReactStrictMode-test.js +++ b/packages/react/src/__tests__/ReactStrictMode-test.js @@ -480,7 +480,7 @@ Please update the following components: AsyncRoot`, ], {withoutStack: true}, ); - }).toLowPriorityWarnDev( + }).toWarnDev( [ /* eslint-disable max-len */ `Warning: componentWillMount has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details. diff --git a/packages/react/src/__tests__/createReactClassIntegration-test.internal.js b/packages/react/src/__tests__/createReactClassIntegration-test.internal.js index f6b7a955d51346..a13797371ae0c0 100644 --- a/packages/react/src/__tests__/createReactClassIntegration-test.internal.js +++ b/packages/react/src/__tests__/createReactClassIntegration-test.internal.js @@ -50,7 +50,7 @@ describe('create-react-class-integration', () => { render: () => null, }); - expect(() => ReactNative.render(, 1)).toLowPriorityWarnDev( + expect(() => ReactNative.render(, 1)).toWarnDev( 'componentWillMount has been renamed', {withoutStack: true}, ); @@ -64,7 +64,7 @@ describe('create-react-class-integration', () => { render: () => null, }); - expect(() => ReactNative.render(, 1)).toLowPriorityWarnDev( + expect(() => ReactNative.render(, 1)).toWarnDev( 'componentWillReceiveProps has been renamed', {withoutStack: true}, ); diff --git a/packages/react/src/__tests__/createReactClassIntegration-test.js b/packages/react/src/__tests__/createReactClassIntegration-test.js index 0ec089ed88f973..b505e5ff34f4a9 100644 --- a/packages/react/src/__tests__/createReactClassIntegration-test.js +++ b/packages/react/src/__tests__/createReactClassIntegration-test.js @@ -555,7 +555,7 @@ describe('create-react-class-integration', () => { 'The above lifecycles should be removed. Learn more about this warning here:\n' + 'https://fb.me/react-unsafe-component-lifecycles', ); - }).toLowPriorityWarnDev( + }).toWarnDev( [ 'componentWillMount has been renamed', 'componentWillReceiveProps has been renamed', @@ -598,7 +598,7 @@ describe('create-react-class-integration', () => { 'The above lifecycles should be removed. Learn more about this warning here:\n' + 'https://fb.me/react-unsafe-component-lifecycles', ); - }).toLowPriorityWarnDev( + }).toWarnDev( [ 'componentWillMount has been renamed', 'componentWillReceiveProps has been renamed', @@ -641,9 +641,7 @@ describe('create-react-class-integration', () => { }); const div = document.createElement('div'); - expect(() => - ReactDOM.render(, div), - ).toLowPriorityWarnDev( + expect(() => ReactDOM.render(, div)).toWarnDev( [ 'componentWillMount has been renamed', 'componentWillReceiveProps has been renamed', diff --git a/scripts/jest/matchers/toWarnDev.js b/scripts/jest/matchers/toWarnDev.js index 9a5b5939823aab..70657f716ba3e4 100644 --- a/scripts/jest/matchers/toWarnDev.js +++ b/scripts/jest/matchers/toWarnDev.js @@ -258,7 +258,6 @@ const createMatcherFor = (consoleMethod, matcherName) => }; module.exports = { - // TODO: rename this one. - toLowPriorityWarnDev: createMatcherFor('warn', 'toLowPriorityWarnDev'), + toWarnDev: createMatcherFor('warn', 'toWarnDev'), toErrorDev: createMatcherFor('error', 'toErrorDev'), };