From f8fb2cee7de0a67ec4f5ffd18a5d04a25a18a972 Mon Sep 17 00:00:00 2001 From: Marin Atanasov Date: Tue, 18 Oct 2022 17:29:13 +0300 Subject: [PATCH 1/2] ESLint: Fix testing-library/no-render-in-setup violations --- packages/components/src/base-field/test/index.js | 8 ++++---- packages/components/src/ui/spinner/test/index.js | 7 +++---- packages/components/src/ui/tooltip/test/index.js | 8 ++++++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/components/src/base-field/test/index.js b/packages/components/src/base-field/test/index.js index b5ed5ef4b05fa4..97782e777c097f 100644 --- a/packages/components/src/base-field/test/index.js +++ b/packages/components/src/base-field/test/index.js @@ -16,16 +16,14 @@ const TestField = ( props ) => { describe( 'base field', () => { let base; - beforeEach( () => { - base = render( ).container; - } ); - it( 'should render correctly', () => { + base = render( ).container; expect( base.firstChild ).toMatchSnapshot(); } ); describe( 'props', () => { it( 'should render error styles', () => { + base = render( ).container; const { container } = render( ); expect( container.firstChild ).toMatchStyleDiffSnapshot( base.firstChild @@ -33,6 +31,7 @@ describe( 'base field', () => { } ); it( 'should render inline styles', () => { + base = render( ).container; const { container } = render( ); expect( container.firstChild ).toMatchStyleDiffSnapshot( base.firstChild @@ -40,6 +39,7 @@ describe( 'base field', () => { } ); it( 'should render subtle styles', () => { + base = render( ).container; const { container } = render( ); expect( container.firstChild ).toMatchStyleDiffSnapshot( base.firstChild diff --git a/packages/components/src/ui/spinner/test/index.js b/packages/components/src/ui/spinner/test/index.js index fe8dd4390e7f70..55afd94f4ee014 100644 --- a/packages/components/src/ui/spinner/test/index.js +++ b/packages/components/src/ui/spinner/test/index.js @@ -11,15 +11,13 @@ import { Spinner } from '..'; describe( 'props', () => { let base; - beforeEach( () => { - base = render( ); - } ); - test( 'should render correctly', () => { + base = render( ); expect( base.container.firstChild ).toMatchSnapshot(); } ); test( 'should render color', () => { + base = render( ); const { container } = render( ); expect( container.firstChild ).toMatchDiffSnapshot( base.container.firstChild @@ -27,6 +25,7 @@ describe( 'props', () => { } ); test( 'should render size', () => { + base = render( ); const { container } = render( ); expect( container.firstChild ).toMatchDiffSnapshot( base.container.firstChild diff --git a/packages/components/src/ui/tooltip/test/index.js b/packages/components/src/ui/tooltip/test/index.js index 0a13319b999256..f87818d7671373 100644 --- a/packages/components/src/ui/tooltip/test/index.js +++ b/packages/components/src/ui/tooltip/test/index.js @@ -13,20 +13,22 @@ describe( 'props', () => { const baseTooltipId = 'base-tooltip'; const baseTooltipTriggerContent = 'WordPress.org - Base trigger content'; const byId = ( id ) => ( t ) => t.id === id; - beforeEach( () => { + const renderVisibleTooltip = () => { render( { baseTooltipTriggerContent } ); - } ); + }; test( 'should render correctly', () => { + renderVisibleTooltip(); const tooltip = screen.getByRole( /tooltip/i ); expect( tooltip ).toMatchSnapshot(); } ); test( 'should render invisible', () => { + renderVisibleTooltip(); const invisibleTooltipTriggerContent = 'WordPress.org - Invisible'; render( { } ); test( 'should render without children', () => { + renderVisibleTooltip(); const childlessTooltipId = 'tooltip-without-children'; render( { } ); test( 'should not render a tooltip without content', () => { + renderVisibleTooltip(); const contentlessTooltipId = 'contentless-tooltip'; render( From 87ac0e41381064fc3b91e91bc1c3174e65c49ee5 Mon Sep 17 00:00:00 2001 From: Marin Atanasov Date: Wed, 19 Oct 2022 11:53:25 +0300 Subject: [PATCH 2/2] Use local variables only --- packages/components/src/base-field/test/index.js | 10 ++++------ packages/components/src/ui/spinner/test/index.js | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/components/src/base-field/test/index.js b/packages/components/src/base-field/test/index.js index 97782e777c097f..8204163c2b6c40 100644 --- a/packages/components/src/base-field/test/index.js +++ b/packages/components/src/base-field/test/index.js @@ -14,16 +14,14 @@ const TestField = ( props ) => { }; describe( 'base field', () => { - let base; - it( 'should render correctly', () => { - base = render( ).container; + const base = render( ).container; expect( base.firstChild ).toMatchSnapshot(); } ); describe( 'props', () => { it( 'should render error styles', () => { - base = render( ).container; + const base = render( ).container; const { container } = render( ); expect( container.firstChild ).toMatchStyleDiffSnapshot( base.firstChild @@ -31,7 +29,7 @@ describe( 'base field', () => { } ); it( 'should render inline styles', () => { - base = render( ).container; + const base = render( ).container; const { container } = render( ); expect( container.firstChild ).toMatchStyleDiffSnapshot( base.firstChild @@ -39,7 +37,7 @@ describe( 'base field', () => { } ); it( 'should render subtle styles', () => { - base = render( ).container; + const base = render( ).container; const { container } = render( ); expect( container.firstChild ).toMatchStyleDiffSnapshot( base.firstChild diff --git a/packages/components/src/ui/spinner/test/index.js b/packages/components/src/ui/spinner/test/index.js index 55afd94f4ee014..39ced6662a7654 100644 --- a/packages/components/src/ui/spinner/test/index.js +++ b/packages/components/src/ui/spinner/test/index.js @@ -9,15 +9,13 @@ import { render } from '@testing-library/react'; import { Spinner } from '..'; describe( 'props', () => { - let base; - test( 'should render correctly', () => { - base = render( ); + const base = render( ); expect( base.container.firstChild ).toMatchSnapshot(); } ); test( 'should render color', () => { - base = render( ); + const base = render( ); const { container } = render( ); expect( container.firstChild ).toMatchDiffSnapshot( base.container.firstChild @@ -25,7 +23,7 @@ describe( 'props', () => { } ); test( 'should render size', () => { - base = render( ); + const base = render( ); const { container } = render( ); expect( container.firstChild ).toMatchDiffSnapshot( base.container.firstChild