Scripts: ESLint minor version upgrade to 7.17.0 (#27965)

* Scripts: Upgrade ESLint and its configuration to version 7.17 * Autofix errors detected in unit tests * Disable more linting errors used in the existing code * Fix more reported warnings * Add changelog entries for ESLint upgrade * Update the package lock file * Update test snapshots to align with test name changes
WordPress · Jan 4, 2021 · 53291fe · 53291fe
1 parent e073409
commit 53291fe
Show file tree

Hide file tree

Showing 53 changed files with 1,101 additions and 565 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/api-fetch/src/middlewares/test/fetch-all-middleware.js b/packages/api-fetch/src/middlewares/test/fetch-all-middleware.js
@@ -20,11 +20,12 @@ describe( 'Fetch All Middleware', () => {
 		const originalOptions = { url: '/posts?per_page=-1' };
 		let counter = 1;
 		jest.doMock( '../../index.js', () => ( options ) => {
-			if ( counter === 1 ) {
-				expect( options.url ).toBe( '/posts?per_page=100' );
-			} else {
-				expect( options.url ).toBe( '/posts?per_page=100&page=2' );
-			}
+			const expectedUrl =
+				counter === 1
+					? '/posts?per_page=100'
+					: '/posts?per_page=100&page=2';
+			expect( options.url ).toBe( expectedUrl );
+
 			const response = Promise.resolve( {
 				status: 200,
 				headers: {

diff --git a/packages/block-directory/src/store/test/selectors.js b/packages/block-directory/src/store/test/selectors.js
@@ -234,11 +234,11 @@ describe( 'selectors', () => {
 			},
 		};
 
-		it( 'it should reflect that the block is installing', () => {
+		it( 'should reflect that the block is installing', () => {
 			expect( isInstalling( state, BLOCK_1_ID ) ).toBeTruthy();
 		} );
 
-		it( 'it should reflect that the block is not installing', () => {
+		it( 'should reflect that the block is not installing', () => {
 			expect( isInstalling( state, 'not-in-state' ) ).toBeFalsy();
 			expect( isInstalling( state, BLOCK_2_ID ) ).toBeFalsy();
 		} );

diff --git a/packages/block-editor/src/components/responsive-block-control/test/index.js b/packages/block-editor/src/components/responsive-block-control/test/index.js
@@ -362,7 +362,7 @@ describe( 'Default and Responsive modes', () => {
 		expect( responsiveControlGroup ).toBeNull();
 	} );
 
-	it( 'should render custom responsive controls when renderResponsiveControls prop is provided and in responsive mode ', () => {
+	it( 'should render custom responsive controls when renderResponsiveControls prop is provided and in responsive mode', () => {
 		const spyRenderDefaultControl = jest.fn();
 
 		const mockRenderResponsiveControls = jest.fn( ( viewports ) => {

diff --git a/packages/block-editor/src/store/test/selectors.js b/packages/block-editor/src/store/test/selectors.js
@@ -2930,7 +2930,7 @@ describe( 'selectors', () => {
 			expect( getTemplateLock( state ) ).toBe( 'all' );
 		} );
 
-		it( 'should return null if the specified clientId was not found ', () => {
+		it( 'should return null if the specified clientId was not found', () => {
 			const state = {
 				settings: { templateLock: 'all' },
 				blockListSettings: {

diff --git a/packages/block-serialization-spec-parser/shared-tests.js b/packages/block-serialization-spec-parser/shared-tests.js
@@ -335,9 +335,9 @@ const hasPHP =
 // skipping preserves snapshots while commenting out or simply
 // not injecting the tests prompts `jest` to remove "obsolete snapshots"
 const makeTest = hasPHP
-	? // eslint-disable-next-line jest/valid-describe
+	? // eslint-disable-next-line jest/valid-describe, jest/valid-title
 	  ( ...args ) => describe( ...args )
-	: // eslint-disable-next-line jest/no-disabled-tests, jest/valid-describe
+	: // eslint-disable-next-line jest/no-disabled-tests, jest/valid-describe, jest/valid-title
 	  ( ...args ) => describe.skip( ...args );
 
 export const phpTester = ( name, filename ) =>

diff --git a/packages/blocks/src/api/test/registration.js b/packages/blocks/src/api/test/registration.js
@@ -646,6 +646,7 @@ describe( 'blocks', () => {
 						// Verify that for deprecations, the filter is called with a merge of pre-filter
 						// settings with deprecation keys omitted and the deprecation entry.
 						if ( i > 0 ) {
+							// eslint-disable-next-line jest/no-conditional-expect
 							expect( settings ).toEqual( {
 								...omit(
 									{

diff --git a/packages/components/src/color-picker/test/input.js b/packages/components/src/color-picker/test/input.js
@@ -13,7 +13,7 @@ import { DOWN, ENTER, SPACE, UP } from '@wordpress/keycodes';
  */
 import { Input } from '../inputs';
 
-describe( 'Input ', () => {
+describe( 'Input', () => {
 	describe( 'calls onChange prop with commit state', () => {
 		test( 'onKeyDown = ENTER', () => {
 			const onChange = jest.fn();

diff --git a/packages/components/src/external-link/index.js b/packages/components/src/external-link/index.js
@@ -26,11 +26,11 @@ export function ExternalLink(
 	).join( ' ' );
 	const classes = classnames( 'components-external-link', className );
 	return (
+		/* eslint-disable react/jsx-no-target-blank */
 		<a
 			{ ...additionalProps }
 			className={ classes }
 			href={ href }
-			// eslint-disable-next-line react/jsx-no-target-blank
 			target="_blank"
 			rel={ rel }
 			ref={ ref }
@@ -47,6 +47,7 @@ export function ExternalLink(
 				className="components-external-link__icon"
 			/>
 		</a>
+		/* eslint-enable react/jsx-no-target-blank */
 	);
 }
 

diff --git a/packages/components/src/form-token-field/test/index.js b/packages/components/src/form-token-field/test/index.js
@@ -241,7 +241,7 @@ describe( 'FormTokenField', () => {
 
 			// before sending a hover event, we need to wait for
 			// SuggestionList#_scrollingIntoView to become false
-			jest.runTimersToTime( 100 );
+			jest.advanceTimersByTime( 100 );
 
 			TestUtils.Simulate.mouseEnter( hoverSuggestion );
 			expect( getSelectedSuggestion() ).toEqual( [ 'wi', 'th' ] );

diff --git a/packages/compose/src/utils/create-higher-order-component/test/index.js b/packages/compose/src/utils/create-higher-order-component/test/index.js
@@ -18,7 +18,7 @@ describe( 'createHigherOrderComponent', () => {
 		expect( TestComponent.displayName ).toBe( 'WithTest(Component)' );
 	} );
 
-	it( 'should use camel case starting with upper for wrapper prefix ', () => {
+	it( 'should use camel case starting with upper for wrapper prefix', () => {
 		const TestComponent = createHigherOrderComponent(
 			( OriginalComponent ) => OriginalComponent,
 			'with-one-two_threeFOUR'

diff --git a/packages/core-data/src/test/resolvers.js b/packages/core-data/src/test/resolvers.js
@@ -316,7 +316,7 @@ describe( 'getAutosaves', () => {
 		);
 	} );
 
-	it( ' yields undefined if no autosaves exist for the post', async () => {
+	it( 'yields undefined if no autosaves exist for the post', async () => {
 		const postType = 'post';
 		const postId = 1;
 		const restBase = 'posts';

diff --git a/packages/data/src/redux-store/test/index.js b/packages/data/src/redux-store/test/index.js
@@ -83,6 +83,7 @@ describe( 'controls', () => {
 					.hasFinishedResolution( 'getItems' );
 				if ( isFinished ) {
 					const items = registry.select( 'store' ).getItems();
+					// eslint-disable-next-line jest/no-conditional-expect
 					expect( items ).toEqual( [ 1, 2, 3 ] );
 				}
 				resolve();

diff --git a/packages/e2e-tests/config/setup-debug-artifacts.js b/packages/e2e-tests/config/setup-debug-artifacts.js
@@ -21,7 +21,7 @@ if ( ! fs.existsSync( ARTIFACTS_PATH ) ) {
  * Kudos to Tom Esterez (@testerez) for sharing this idea in https://github.com/smooth-code/jest-puppeteer/issues/131#issuecomment-424073620
  */
 let artifactsPromise;
-// eslint-disable-next-line jest/no-jasmine-globals
+// eslint-disable-next-line jest/no-jasmine-globals, no-undef
 jasmine.getEnv().addReporter( {
 	specDone: ( result ) => {
 		if ( result.status === 'failed' ) {

diff --git a/packages/e2e-tests/specs/editor/blocks/__snapshots__/heading.test.js.snap b/packages/e2e-tests/specs/editor/blocks/__snapshots__/heading.test.js.snap
@@ -12,13 +12,13 @@ exports[`Heading can be created by prefixing number sign and a space 1`] = `
 <!-- /wp:heading -->"
 `;
 
-exports[`Heading it should correctly apply custom colors 1`] = `
+exports[`Heading should correctly apply custom colors 1`] = `
 "<!-- wp:heading {\\"level\\":3,\\"style\\":{\\"color\\":{\\"text\\":\\"#7700ff\\"}}} -->
 <h3 class=\\"has-text-color\\" style=\\"color:#7700ff\\">Heading</h3>
 <!-- /wp:heading -->"
 `;
 
-exports[`Heading it should correctly apply named colors 1`] = `
+exports[`Heading should correctly apply named colors 1`] = `
 "<!-- wp:heading {\\"textColor\\":\\"luminous-vivid-orange\\"} -->
 <h2 class=\\"has-luminous-vivid-orange-color has-text-color\\">Heading</h2>
 <!-- /wp:heading -->"

diff --git a/packages/e2e-tests/specs/editor/blocks/heading.test.js b/packages/e2e-tests/specs/editor/blocks/heading.test.js
@@ -67,7 +67,7 @@ describe( 'Heading', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
-	it( 'it should correctly apply custom colors', async () => {
+	it( 'should correctly apply custom colors', async () => {
 		await clickBlockAppender();
 		await page.keyboard.type( '### Heading' );
 		const colorPanelToggle = await page.waitForXPath(
@@ -91,7 +91,7 @@ describe( 'Heading', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
-	it( 'it should correctly apply named colors', async () => {
+	it( 'should correctly apply named colors', async () => {
 		await clickBlockAppender();
 		await page.keyboard.type( '## Heading' );
 		const [ colorPanelToggle ] = await page.$x(

diff --git a/packages/e2e-tests/specs/editor/plugins/__snapshots__/container-blocks.test.js.snap b/packages/e2e-tests/specs/editor/plugins/__snapshots__/container-blocks.test.js.snap
@@ -16,7 +16,7 @@ exports[`InnerBlocks Template Sync Ensure inner block writing flow works as expe
 <!-- /wp:test/test-inner-blocks-paragraph-placeholder -->"
 `;
 
-exports[`InnerBlocks Template Sync Ensures blocks without locking are kept intact even if they do not match the template  1`] = `
+exports[`InnerBlocks Template Sync Ensures blocks without locking are kept intact even if they do not match the template 1`] = `
 "<!-- wp:test/test-inner-blocks-no-locking -->
 <!-- wp:paragraph {\\"fontSize\\":\\"large\\"} -->
 <p class=\\"has-large-font-size\\">Content…</p>
@@ -28,7 +28,7 @@ exports[`InnerBlocks Template Sync Ensures blocks without locking are kept intac
 <!-- /wp:test/test-inner-blocks-no-locking -->"
 `;
 
-exports[`InnerBlocks Template Sync Removes blocks that are not expected by the template if a lock all exists  1`] = `
+exports[`InnerBlocks Template Sync Removes blocks that are not expected by the template if a lock all exists 1`] = `
 "<!-- wp:test/test-inner-blocks-locking-all -->
 <!-- wp:paragraph {\\"fontSize\\":\\"large\\"} -->
 <p class=\\"has-large-font-size\\">Content…</p>

diff --git a/...es/e2e-tests/specs/editor/plugins/__snapshots__/inner-blocks-render-appender.test.js.snap b/...es/e2e-tests/specs/editor/plugins/__snapshots__/inner-blocks-render-appender.test.js.snap
@@ -1,14 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`RenderAppender prop of InnerBlocks  Users can customize the appender and can still insert blocks using exposed components 1`] = `
+exports[`RenderAppender prop of InnerBlocks Users can customize the appender and can still insert blocks using exposed components 1`] = `
 "<!-- wp:test/inner-blocks-render-appender -->
 <div style=\\"outline:1px solid gray;padding:5px\\" class=\\"wp-block-test-inner-blocks-render-appender\\"><!-- wp:quote -->
 <blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
 <!-- /wp:quote --></div>
 <!-- /wp:test/inner-blocks-render-appender -->"
 `;
 
-exports[`RenderAppender prop of InnerBlocks  Users can dynamically customize the appender 1`] = `
+exports[`RenderAppender prop of InnerBlocks Users can dynamically customize the appender 1`] = `
 "<!-- wp:test/inner-blocks-render-appender-dynamic -->
 <div style=\\"outline:1px solid gray;padding:5px\\" class=\\"wp-block-test-inner-blocks-render-appender-dynamic\\"><!-- wp:quote -->
 <blockquote class=\\"wp-block-quote\\"><p></p></blockquote>

diff --git a/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js b/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js
@@ -52,15 +52,15 @@ describe( 'InnerBlocks Template Sync', () => {
 		await switchEditorModeTo( 'Visual' );
 	};
 
-	it( 'Ensures blocks without locking are kept intact even if they do not match the template ', async () => {
+	it( 'Ensures blocks without locking are kept intact even if they do not match the template', async () => {
 		await insertBlockAndAddParagraphInside(
 			'Test Inner Blocks no locking',
 			'test/test-inner-blocks-no-locking'
 		);
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
-	it( 'Removes blocks that are not expected by the template if a lock all exists ', async () => {
+	it( 'Removes blocks that are not expected by the template if a lock all exists', async () => {
 		await insertBlockAndAddParagraphInside(
 			'Test InnerBlocks locking all',
 			'test/test-inner-blocks-locking-all'

diff --git a/packages/e2e-tests/specs/editor/plugins/custom-post-types.test.js b/packages/e2e-tests/specs/editor/plugins/custom-post-types.test.js
@@ -32,7 +32,7 @@ describe( 'Test Custom Post Types', () => {
 		await deactivatePlugin( 'gutenberg-test-custom-post-types' );
 	} );
 
-	it( 'It should be able to create an hierarchical post without title support', async () => {
+	it( 'should be able to create an hierarchical post without title support', async () => {
 		const PARENT_PAGE_INPUT =
 			'.editor-page-attributes__parent input:not([disabled])';
 		const SUGGESTION =

diff --git a/packages/e2e-tests/specs/editor/plugins/inner-blocks-allowed-blocks.test.js b/packages/e2e-tests/specs/editor/plugins/inner-blocks-allowed-blocks.test.js
@@ -11,7 +11,7 @@ import {
 	closeGlobalBlockInserter,
 } from '@wordpress/e2e-test-utils';
 
-describe( 'Allowed Blocks Setting on InnerBlocks ', () => {
+describe( 'Allowed Blocks Setting on InnerBlocks', () => {
 	const paragraphSelector =
 		'.block-editor-rich-text__editable[data-type="core/paragraph"]';
 	beforeAll( async () => {

diff --git a/packages/e2e-tests/specs/editor/plugins/inner-blocks-render-appender.test.js b/packages/e2e-tests/specs/editor/plugins/inner-blocks-render-appender.test.js
@@ -17,7 +17,7 @@ const QUOTE_INSERT_BUTTON_SELECTOR = '//button[.="Quote"]';
 const APPENDER_SELECTOR = '.my-custom-awesome-appender';
 const DYNAMIC_APPENDER_SELECTOR = 'my-dynamic-blocks-appender';
 
-describe( 'RenderAppender prop of InnerBlocks ', () => {
+describe( 'RenderAppender prop of InnerBlocks', () => {
 	beforeAll( async () => {
 		await activatePlugin( 'gutenberg-test-innerblocks-render-appender' );
 	} );

diff --git a/...ages/e2e-tests/specs/editor/various/__snapshots__/block-hierarchy-navigation.test.js.snap b/...ages/e2e-tests/specs/editor/various/__snapshots__/block-hierarchy-navigation.test.js.snap
@@ -50,7 +50,7 @@ exports[`Navigating the block hierarchy should navigate using the block hierarch
 <!-- /wp:columns -->"
 `;
 
-exports[`Navigating the block hierarchy should select the wrapper div for a group  1`] = `
+exports[`Navigating the block hierarchy should select the wrapper div for a group 1`] = `
 "<!-- wp:group -->
 <div class=\\"wp-block-group\\"><div class=\\"wp-block-group__inner-container\\"><!-- wp:paragraph -->
 <p>just a paragraph</p>

diff --git a/packages/e2e-tests/specs/editor/various/block-grouping.test.js b/packages/e2e-tests/specs/editor/various/block-grouping.test.js
@@ -140,7 +140,7 @@ describe( 'Block Grouping', () => {
 			expect( availableTransforms ).not.toContain( 'Group' );
 		} );
 
-		it( 'does not show group option in the options toolbar if Grouping block is disabled ', async () => {
+		it( 'does not show group option in the options toolbar if Grouping block is disabled', async () => {
 			await clickBlockToolbarButton( 'More options' );
 
 			const blockOptionsDropdownHTML = await page.evaluate(

diff --git a/packages/e2e-tests/specs/editor/various/block-hierarchy-navigation.test.js b/packages/e2e-tests/specs/editor/various/block-hierarchy-navigation.test.js
@@ -154,7 +154,7 @@ describe( 'Navigating the block hierarchy', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
-	it( 'should select the wrapper div for a group ', async () => {
+	it( 'should select the wrapper div for a group', async () => {
 		// Insert a group block
 		await insertBlock( 'Group' );