From f84ccc98e8653fbd9129dffc6fe4dee03a35d9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E4=B9=99=E5=B1=B1?= Date: Wed, 16 Jan 2019 15:54:37 +0800 Subject: [PATCH] [Refactor]: polish Suspense and Lazy in shallow/mount tests --- .../test/ReactWrapper-spec.jsx | 17 ++++++++++++----- .../test/ShallowWrapper-spec.jsx | 15 +++++++++++---- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx index ea6d74325..f5f6ddab5 100644 --- a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx +++ b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx @@ -571,6 +571,13 @@ describeWithDOM('mount', () => { ); } } + class Fallback extends React.Component { + render() { + return ( +
Fallback
+ ); + } + } it('finds Suspense and its children when no lazy component', () => { class Component extends React.Component { render() { @@ -580,20 +587,20 @@ describeWithDOM('mount', () => { } } const SuspenseComponent = () => ( - + ); const wrapper = mount(); - expect(wrapper.find('SuspenseComponent')).to.have.lengthOf(1); + expect(wrapper.is(SuspenseComponent)).to.equal(true); expect(wrapper.find(Component)).to.have.lengthOf(1); + expect(wrapper.find(Fallback)).to.have.lengthOf(0); }); it('finds fallback when given lazy component in initial mount', () => { const LazyComponent = lazy(() => fakeDynamicImport(DynamicComponent)); - const Fallback = () =>
; const SuspenseComponent = () => ( }> @@ -602,9 +609,9 @@ describeWithDOM('mount', () => { const wrapper = mount(); - expect(wrapper.find('SuspenseComponent')).to.have.lengthOf(1); + expect(wrapper.is(SuspenseComponent)).to.equal(true); expect(wrapper.find(LazyComponent)).to.have.lengthOf(0); - expect(wrapper.find('Fallback')).to.have.lengthOf(1); + expect(wrapper.find(Fallback)).to.have.lengthOf(1); }); }); diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx index a03f4c68b..69b333a75 100644 --- a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx +++ b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx @@ -1285,6 +1285,13 @@ describe('shallow', () => { ); } } + class Fallback extends React.Component { + render() { + return ( +
Fallback
+ ); + } + } it('finds Suspense and its children when no lazy component', () => { class Component extends React.Component { render() { @@ -1294,20 +1301,20 @@ describe('shallow', () => { } } const SuspenseComponent = () => ( - + }> ); const wrapper = shallow(); - expect(wrapper.find('Suspense')).to.have.lengthOf(1); + expect(wrapper.is(Suspense)).to.equal(true); expect(wrapper.find(Component)).to.have.lengthOf(1); + expect(wrapper.find(Fallback)).to.have.lengthOf(0) }); it('finds Lazy when given lazy component', () => { const LazyComponent = lazy(fakeDynamicImport(DynamicComponent)); - const Fallback = () =>
; const SuspenseComponent = () => ( }> @@ -1316,7 +1323,7 @@ describe('shallow', () => { const wrapper = shallow(); - expect(wrapper.find('Suspense')).to.have.lengthOf(1); + expect(wrapper.is(Suspense)).to.equal(true); expect(wrapper.find(LazyComponent)).to.have.lengthOf(1); // won't render fallback in shallow renderer expect(wrapper.find(Fallback)).to.have.lengthOf(0);