From b5afdb9e3ea885c84bbd55da88eae36fc085aa9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E4=B9=99=E5=B1=B1?= Date: Tue, 19 Mar 2019 08:52:25 +0800 Subject: [PATCH] =?UTF-8?q?[enzyme-adapter-react-16]=20Don=E2=80=99t=20sho?= =?UTF-8?q?w=20wrapped=20component=20displayName=20in=20lazy=20component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/ReactSixteenAdapter.js | 6 +--- .../enzyme-test-suite/test/Adapter-spec.jsx | 36 ------------------- .../test/ShallowWrapper-spec.jsx | 14 -------- 3 files changed, 1 insertion(+), 55 deletions(-) diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js index fd7e36822..5ead193ce 100644 --- a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js +++ b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js @@ -754,11 +754,7 @@ class ReactSixteenAdapter extends EnzymeAdapter { return name ? `ForwardRef(${name})` : 'ForwardRef'; } case Lazy || NaN: { - if (type.displayName) { - return type.displayName; - } - const name = displayNameOfNode({ type: type._result }); - return name ? `lazy(${name})` : 'lazy'; + return 'lazy'; } default: return displayNameOfNode(node); } diff --git a/packages/enzyme-test-suite/test/Adapter-spec.jsx b/packages/enzyme-test-suite/test/Adapter-spec.jsx index 7527cbd21..016d2505c 100644 --- a/packages/enzyme-test-suite/test/Adapter-spec.jsx +++ b/packages/enzyme-test-suite/test/Adapter-spec.jsx @@ -1079,42 +1079,6 @@ describe('Adapter', () => { const LazyComponent = lazy(() => fakeDynamicImport(DynamicComponent)); expect(getDisplayName()).to.equal('lazy'); }); - - itIf(is('>= 16.6'), 'show explicitly defined display name of lazy component', () => { - class DynamicComponent extends React.Component { - render() { - return
DynamicComponent
; - } - } - const theDisplayName = 'SOMETHING'; - const LazyComponent = Object.assign(lazy(() => fakeDynamicImport(DynamicComponent)), { displayName: theDisplayName }); - expect(getDisplayName()).to.equal(theDisplayName); - }); - - itIf(is('>= 16.6'), 'show display name of wrapped component of lazy', () => { - class ComponentWithDisplayName extends React.Component { - render() { - return
DynamicComponent
; - } - } - ComponentWithDisplayName.displayName = 'Something'; - const LazyComponent = lazy(() => fakeDynamicImport(ComponentWithDisplayName)); - /* eslint-disable no-underscore-dangle */ - LazyComponent._result = ComponentWithDisplayName; - expect(getDisplayName()).to.equal(`lazy(${ComponentWithDisplayName.displayName})`); - }); - - itIf(is('>= 16.6'), 'show name of wrapped component of lazy if its displayName is empty', () => { - class ComponentWithoutDisplayName extends React.Component { - render() { - return
DynamicComponent
; - } - } - const LazyComponent = lazy(() => fakeDynamicImport(ComponentWithoutDisplayName)); - /* eslint-disable no-underscore-dangle */ - LazyComponent._result = ComponentWithoutDisplayName; - expect(getDisplayName()).to.equal('lazy(ComponentWithoutDisplayName)'); - }); }); describeIf(is('>= 16.2'), 'determines if node isFragment', () => { diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx index a3dc59349..7c58d2025 100644 --- a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx +++ b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx @@ -1688,20 +1688,6 @@ describe('shallow', () => { expect(wrapper.debug()).to.equal(''); }); - it('returns lazy component string including wrapped component when debug() is called and lazy component is loaded', () => { - const LazyComponent = lazy(fakeDynamicImport(DynamicComponent)); - /* eslint-disable no-underscore-dangle */ - LazyComponent._result = DynamicComponent; - - const wrapper = shallow(( - }> - - - )); - - expect(wrapper.debug()).to.equal(''); - }); - it('replaces LazyComponent with Fallback when render Suspense if options.suspenseFallback=true', () => { const LazyComponent = lazy(fakeDynamicImport(DynamicComponent));