Content…
@@ -28,7 +28,7 @@ exports[`InnerBlocks Template Sync Ensures blocks without locking are kept intac " `; -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`] = ` "Content…
diff --git a/packages/e2e-tests/specs/editor/plugins/__snapshots__/inner-blocks-render-appender.test.js.snap b/packages/e2e-tests/specs/editor/plugins/__snapshots__/inner-blocks-render-appender.test.js.snap index 402ab843ff397..231ef215354a8 100644 --- a/packages/e2e-tests/specs/editor/plugins/__snapshots__/inner-blocks-render-appender.test.js.snap +++ b/packages/e2e-tests/specs/editor/plugins/__snapshots__/inner-blocks-render-appender.test.js.snap @@ -1,6 +1,6 @@ // 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`] = ` "@@ -8,7 +8,7 @@ exports[`RenderAppender prop of InnerBlocks Users can customize the appender an " `; -exports[`RenderAppender prop of InnerBlocks Users can dynamically customize the appender 1`] = ` +exports[`RenderAppender prop of InnerBlocks Users can dynamically customize the appender 1`] = ` "
diff --git a/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js b/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js index e6d162eb18520..1282bb49f17ff 100644 --- a/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js +++ b/packages/e2e-tests/specs/editor/plugins/container-blocks.test.js @@ -52,7 +52,7 @@ 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' @@ -60,7 +60,7 @@ describe( 'InnerBlocks Template Sync', () => { 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 index 062d8b56c0725..73e00ec1a5a91 100644 --- 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 index 1e02d4369f1b3..65c94104b80c7 100644 --- 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 index 182f224d0976f..3c25fd93541ca 100644 --- 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/packages/e2e-tests/specs/editor/various/__snapshots__/block-hierarchy-navigation.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/block-hierarchy-navigation.test.js.snap index 14f85661ea22e..7904000d8aad2 100644 --- a/packages/e2e-tests/specs/editor/various/__snapshots__/block-hierarchy-navigation.test.js.snap +++ b/packages/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 " `; -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`] = ` "
just a paragraph
diff --git a/packages/e2e-tests/specs/editor/various/block-grouping.test.js b/packages/e2e-tests/specs/editor/various/block-grouping.test.js index 64292a0500b6c..016d62d6cc68b 100644 --- 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 index 919a10bebe0f1..7295b412907e2 100644 --- 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' ); diff --git a/packages/e2e-tests/specs/editor/various/datepicker.test.js b/packages/e2e-tests/specs/editor/various/datepicker.test.js index f2203e92e9a5d..f5b1756163d2f 100644 --- a/packages/e2e-tests/specs/editor/various/datepicker.test.js +++ b/packages/e2e-tests/specs/editor/various/datepicker.test.js @@ -53,85 +53,84 @@ async function getPublishingDate() { ); } -describe( 'Datepicker', () => { - [ 'UTC-10', 'UTC', 'UTC+10' ].forEach( ( timezone ) => { - describe( timezone, () => { - let oldTimezone; - beforeEach( async () => { - oldTimezone = await changeSiteTimezone( timezone ); - await createNewPost(); - } ); - afterEach( async () => { - await changeSiteTimezone( oldTimezone ); - } ); +describe.each( [ [ 'UTC-10' ], [ 'UTC' ], [ 'UTC+10' ] ] )( + `Datepicker %s`, + ( timezone ) => { + let oldTimezone; + beforeEach( async () => { + oldTimezone = await changeSiteTimezone( timezone ); + await createNewPost(); + } ); + afterEach( async () => { + await changeSiteTimezone( oldTimezone ); + } ); - it( 'should show the publishing date as "Immediately" if the date is not altered', async () => { - const publishingDate = await getPublishingDate(); + it( 'should show the publishing date as "Immediately" if the date is not altered', async () => { + const publishingDate = await getPublishingDate(); - expect( publishingDate ).toEqual( 'Immediately' ); - } ); + expect( publishingDate ).toEqual( 'Immediately' ); + } ); - it( 'should show the publishing date if the date is in the past', async () => { - // Open the datepicker. - await page.click( '.edit-post-post-schedule__toggle' ); + it( 'should show the publishing date if the date is in the past', async () => { + // Open the datepicker. + await page.click( '.edit-post-post-schedule__toggle' ); - // Change the publishing date to a year in the past. - await page.click( '.components-datetime__time-field-year' ); - await page.keyboard.press( 'ArrowDown' ); - const datePickerValues = await getDatePickerValues(); + // Change the publishing date to a year in the past. + await page.click( '.components-datetime__time-field-year' ); + await page.keyboard.press( 'ArrowDown' ); + const datePickerValues = await getDatePickerValues(); - // Close the datepicker. - await page.click( '.edit-post-post-schedule__toggle' ); + // Close the datepicker. + await page.click( '.edit-post-post-schedule__toggle' ); - const publishingDate = await getPublishingDate(); + const publishingDate = await getPublishingDate(); - expect( publishingDate ).toBe( - formatDatePickerValues( datePickerValues ) - ); - } ); + expect( publishingDate ).toBe( + formatDatePickerValues( datePickerValues ) + ); + } ); - it( 'should show the publishing date if the date is in the future', async () => { - // Open the datepicker. - await page.click( '.edit-post-post-schedule__toggle' ); + it( 'should show the publishing date if the date is in the future', async () => { + // Open the datepicker. + await page.click( '.edit-post-post-schedule__toggle' ); - // Change the publishing date to a year in the future. - await page.click( '.components-datetime__time-field-year' ); - await page.keyboard.press( 'ArrowUp' ); - const datePickerValues = await getDatePickerValues(); + // Change the publishing date to a year in the future. + await page.click( '.components-datetime__time-field-year' ); + await page.keyboard.press( 'ArrowUp' ); + const datePickerValues = await getDatePickerValues(); - // Close the datepicker. - await page.click( '.edit-post-post-schedule__toggle' ); + // Close the datepicker. + await page.click( '.edit-post-post-schedule__toggle' ); - const publishingDate = await getPublishingDate(); + const publishingDate = await getPublishingDate(); - expect( publishingDate ).not.toEqual( 'Immediately' ); - // The expected date format will be "Sep 26, 2018 11:52 pm". - expect( publishingDate ).toBe( - formatDatePickerValues( datePickerValues ) - ); - } ); + expect( publishingDate ).not.toEqual( 'Immediately' ); + // The expected date format will be "Sep 26, 2018 11:52 pm". + expect( publishingDate ).toBe( + formatDatePickerValues( datePickerValues ) + ); + } ); - it( `should show the publishing date as "Immediately" if the date is cleared`, async () => { - // Open the datepicker. - await page.click( '.edit-post-post-schedule__toggle' ); + it( `should show the publishing date as "Immediately" if the date is cleared`, async () => { + // Open the datepicker. + await page.click( '.edit-post-post-schedule__toggle' ); - // Change the publishing date to a year in the future. - await page.click( '.components-datetime__time-field-year' ); - await page.keyboard.press( 'ArrowUp' ); + // Change the publishing date to a year in the future. + await page.click( '.components-datetime__time-field-year' ); + await page.keyboard.press( 'ArrowUp' ); - // Close the datepicker. - await page.click( '.edit-post-post-schedule__toggle' ); + // Close the datepicker. + await page.click( '.edit-post-post-schedule__toggle' ); - // Open the datepicker. - await page.click( '.edit-post-post-schedule__toggle' ); + // Open the datepicker. + await page.click( '.edit-post-post-schedule__toggle' ); - // Clear the date - await page.click( '.components-datetime__date-reset-button' ); + // Clear the date + await page.click( '.components-datetime__date-reset-button' ); - const publishingDate = await getPublishingDate(); + const publishingDate = await getPublishingDate(); - expect( publishingDate ).toEqual( 'Immediately' ); - } ); + expect( publishingDate ).toEqual( 'Immediately' ); } ); - } ); -} ); + } +); diff --git a/packages/e2e-tests/specs/editor/various/scheduling.test.js b/packages/e2e-tests/specs/editor/various/scheduling.test.js index 7cd9bb11140bd..0ed6171ad7208 100644 --- a/packages/e2e-tests/specs/editor/various/scheduling.test.js +++ b/packages/e2e-tests/specs/editor/various/scheduling.test.js @@ -23,8 +23,9 @@ describe( 'Scheduling', () => { } ); }; - [ 'UTC-10', 'UTC', 'UTC+10' ].forEach( ( timezone ) => { - describe( timezone, () => { + describe.each( [ [ 'UTC-10' ], [ 'UTC' ], [ 'UTC+10' ] ] )( + `Timezone %s`, + ( timezone ) => { let oldTimezone; beforeEach( async () => { oldTimezone = await changeSiteTimezone( timezone ); @@ -49,8 +50,8 @@ describe( 'Scheduling', () => { expect( await getPublishButtonText() ).toBe( 'Schedule…' ); } ); - } ); - } ); + } + ); it( 'Should keep date time UI focused when the previous and next month buttons are clicked', async () => { await createNewPost(); diff --git a/packages/e2e-tests/specs/experiments/navigation.test.js b/packages/e2e-tests/specs/experiments/navigation.test.js index 39eb9d11c3f21..95e22530c0505 100644 --- a/packages/e2e-tests/specs/experiments/navigation.test.js +++ b/packages/e2e-tests/specs/experiments/navigation.test.js @@ -267,6 +267,8 @@ beforeEach( async () => { afterEach( async () => { await setUpResponseMocking( [] ); } ); + +// Skip reason: https://github.com/WordPress/gutenberg/issues/27588. describe.skip( 'Navigation', () => { describe( 'Creating from existing Pages', () => { it( 'allows a navigation block to be created using existing pages', async () => { diff --git a/packages/editor/src/store/test/actions.js b/packages/editor/src/store/test/actions.js index 822d653676869..bcfe203ce1b69 100644 --- a/packages/editor/src/store/test/actions.js +++ b/packages/editor/src/store/test/actions.js @@ -238,6 +238,7 @@ describe( 'Post generator actions', () => { testRoutine, ] ) => { if ( shouldRun( isAutosaving ) ) { + // eslint-disable-next-line jest/valid-title it( testDescription, () => { testRoutine(); } ); diff --git a/packages/editor/src/store/test/selectors.js b/packages/editor/src/store/test/selectors.js index e886d019a81f9..8c0397bc5d458 100644 --- a/packages/editor/src/store/test/selectors.js +++ b/packages/editor/src/store/test/selectors.js @@ -2799,7 +2799,7 @@ describe( 'selectors', () => { ).toEqual( {} ); } ); - it( 'returns the requested default template type ', () => { + it( 'returns the requested default template type', () => { expect( __experimentalGetDefaultTemplateType( state, 'index' ) ).toEqual( { diff --git a/packages/editor/src/store/utils/test/notice-builder.js b/packages/editor/src/store/utils/test/notice-builder.js index bc7df7ac526c6..1f7b6f5a73e3f 100644 --- a/packages/editor/src/store/utils/test/notice-builder.js +++ b/packages/editor/src/store/utils/test/notice-builder.js @@ -80,6 +80,7 @@ describe( 'getNotificationArgumentsForSaveSuccess()', () => { [ previousPostStatus, postStatus, isViewable ], expectedValue, ] ) => { + // eslint-disable-next-line jest/valid-title it( description, () => { previousPost.status = previousPostStatus; post.status = postStatus; @@ -147,6 +148,7 @@ describe( 'getNotificationArgumentsForSaveFail()', () => { [ postStatus, editsStatus ], expectedValue, ] ) => { + // eslint-disable-next-line jest/valid-title it( description, () => { post.status = postStatus; error.code = errorCode; @@ -180,6 +182,7 @@ describe( 'getNotificationArgumentsForTrashFail()', () => { 'Trashing failed', ], ].forEach( ( [ description, error, message ] ) => { + // eslint-disable-next-line jest/valid-title it( description, () => { const expectedValue = [ message, { id: TRASH_POST_NOTICE_ID } ]; expect( getNotificationArgumentsForTrashFail( { error } ) ).toEqual( diff --git a/packages/env/lib/config/test/config.js b/packages/env/lib/config/test/config.js index bc9b793da8628..c9d620b12d218 100644 --- a/packages/env/lib/config/test/config.js +++ b/packages/env/lib/config/test/config.js @@ -1,4 +1,4 @@ -/* eslint-disable jest/no-try-expect */ +/* eslint-disable jest/no-try-expect, jest/no-conditional-expect */ /** * External dependencies */ @@ -1115,4 +1115,4 @@ async function testPortNumberValidation( portName, value, envText = '' ) { } jest.clearAllMocks(); } -/* eslint-enable jest/no-try-expect */ +/* eslint-enable jest/no-try-expect, jest/no-conditional-expect */ diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md index f39b5834e9e7c..d845d07596374 100644 --- a/packages/eslint-plugin/CHANGELOG.md +++ b/packages/eslint-plugin/CHANGELOG.md @@ -7,6 +7,16 @@ - Enabled `import/no-extraneous-dependencies` rule in the `recommended` ruleset. - Enabled `import/no-unresolved` rule in the `recommended` ruleset. - Enabled `no-unsafe-wp-apis` rule in the `recommended` ruleset ([#27327](https://github.com/WordPress/gutenberg/pull/27327)). +- The bundled `eslint-config-prettier` dependency has been updated from requiring `^6.10.1` to requiring `^7.1.0` ([#27965](https://github.com/WordPress/gutenberg/pull/27965)). +- The bundled `eslint-plugin-jest` dependency has been updated from requiring `^23.8.2` to requiring `^24.1.3` ([#27965](https://github.com/WordPress/gutenberg/pull/27965)). + +### Enhancements + +- The bundled `eslint-plugin-jsdoc` dependency has been updated from requiring `^30.2.2` to requiring `^30.7.13` ([#27965](https://github.com/WordPress/gutenberg/pull/27965)). +- The bundled `eslint-plugin-jsx-a11y` dependency has been updated from requiring `^6.2.3` to requiring `^6.4.1` ([#27965](https://github.com/WordPress/gutenberg/pull/27965)). +- The bundled `eslint-plugin-prettier` dependency has been updated from requiring `^3.1.2` to requiring `^3.3.0` ([#27965](https://github.com/WordPress/gutenberg/pull/27965)). +- The bundled `eslint-plugin-react` dependency has been updated from requiring `^7.20.0` to requiring `^7.22.0` ([#27965](https://github.com/WordPress/gutenberg/pull/27965)). +- The bundled `eslint-plugin-react-hooks` dependency has been updated from requiring `^4.0.4` to requiring `^4.2.0` ([#27965](https://github.com/WordPress/gutenberg/pull/27965)). ## 7.4.0 (2020-12-17) diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 594577a2671a7..7765232b27a18 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -34,13 +34,13 @@ "@wordpress/prettier-config": "file:../prettier-config", "babel-eslint": "^10.1.0", "cosmiconfig": "^7.0.0", - "eslint-config-prettier": "^6.10.1", - "eslint-plugin-jest": "^23.8.2", - "eslint-plugin-jsdoc": "^30.2.2", - "eslint-plugin-jsx-a11y": "^6.2.3", - "eslint-plugin-prettier": "^3.1.2", - "eslint-plugin-react": "^7.20.0", - "eslint-plugin-react-hooks": "^4.0.4", + "eslint-config-prettier": "^7.1.0", + "eslint-plugin-jest": "^24.1.3", + "eslint-plugin-jsdoc": "^30.7.13", + "eslint-plugin-jsx-a11y": "^6.4.1", + "eslint-plugin-prettier": "^3.3.0", + "eslint-plugin-react": "^7.22.0", + "eslint-plugin-react-hooks": "^4.2.0", "globals": "^12.0.0", "prettier": "npm:wp-prettier@2.2.1-beta-1", "requireindex": "^1.2.0" diff --git a/packages/hooks/src/test/index.test.js b/packages/hooks/src/test/index.test.js index da86cc5e56f21..837629957b034 100644 --- a/packages/hooks/src/test/index.test.js +++ b/packages/hooks/src/test/index.test.js @@ -516,7 +516,7 @@ test( 'remove all filter callbacks', () => { } ); // Test doingAction, didAction, hasAction. -test( 'Test doingAction, didAction and hasAction.', () => { +test( 'doingAction, didAction and hasAction.', () => { let actionCalls = 0; addAction( 'another.action', 'my_callback', () => {} ); @@ -711,7 +711,7 @@ test( 'adding hooks as a mixin', () => { } ); // Test context. -test( 'Test `this` context via composition', () => { +test( '`this` context via composition', () => { const testObject = { test: 'test this' }; testObject.hooks = createHooks(); diff --git a/packages/react-native-editor/__device-tests__/.eslintrc.js b/packages/react-native-editor/__device-tests__/.eslintrc.js index 8be64e4c826a0..7a9957b5fc572 100644 --- a/packages/react-native-editor/__device-tests__/.eslintrc.js +++ b/packages/react-native-editor/__device-tests__/.eslintrc.js @@ -3,4 +3,7 @@ module.exports = { globals: { editorPage: true, // Defined in 'jest_ui_test_environment.js' }, + rules: { + 'jest/expect-expect': 'off', + }, }; diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-cover.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-cover.test.js index 9ae321e3b3982..7ffd7522f9aff 100644 --- a/packages/react-native-editor/__device-tests__/gutenberg-editor-cover.test.js +++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-cover.test.js @@ -15,6 +15,7 @@ describe( 'Gutenberg Editor Cover Block test', () => { // Temporarily this test is skipped on Android,due to the inconsistency of the results, // which are related to getting values in raw pixels instead of density pixels on Android. + /* eslint-disable jest/no-conditional-expect */ if ( ! isAndroid() ) { const { height } = await coverBlock.getSize(); // Height is set to 20rem, where 1rem is 16. @@ -22,6 +23,7 @@ describe( 'Gutenberg Editor Cover Block test', () => { // Finally, the total height should be 20 * 16 + 32 = 352 expect( height ).toBe( 352 ); } + /* eslint-enable jest/no-conditional-expect */ await coverBlock.click(); expect( coverBlock ).toBeTruthy(); diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-file.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-file.test.js index 040e93d8ac258..81e70fe404335 100644 --- a/packages/react-native-editor/__device-tests__/gutenberg-editor-file.test.js +++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-file.test.js @@ -11,7 +11,7 @@ describe( 'Gutenberg Editor File Block tests @canary', () => { await expect( block ).toBeTruthy(); } ); - it( 'should add a file to the block ', async () => { + it( 'should add a file to the block', async () => { const block = await editorPage.getFirstBlockVisible(); block.click(); diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-image.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-image.test.js index d0f28f6c68249..79b41a5a50b3f 100644 --- a/packages/react-native-editor/__device-tests__/gutenberg-editor-image.test.js +++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-image.test.js @@ -43,6 +43,7 @@ describe( 'Gutenberg Editor Image Block tests @canary', () => { await editorPage.sendTextToParagraphBlock( 2, testData.shortText ); // skip HTML check for Android since we couldn't add image from media library + /* eslint-disable jest/no-conditional-expect */ if ( ! isAndroid() ) { const html = await editorPage.getHtmlContent(); @@ -50,5 +51,6 @@ describe( 'Gutenberg Editor Image Block tests @canary', () => { html.toLowerCase() ); } + /* eslint-enable jest/no-conditional-expect */ } ); } ); diff --git a/packages/react-native-editor/jest_ui_setup_after_env.js b/packages/react-native-editor/jest_ui_setup_after_env.js index 3f90091bf7755..45e06f736ec59 100644 --- a/packages/react-native-editor/jest_ui_setup_after_env.js +++ b/packages/react-native-editor/jest_ui_setup_after_env.js @@ -32,6 +32,7 @@ const getScreenRecordingFileNameBase = ( testPath, id ) => { let allPassed = true; +// eslint-disable-next-line jest/no-jasmine-globals, no-undef jasmine.getEnv().addReporter( { specStarted: ( { testPath, id } ) => { if ( ! isMacOSEnvironment() ) { diff --git a/packages/redux-routine/src/test/index.js b/packages/redux-routine/src/test/index.js index b240f8740894f..3c7caa7115987 100644 --- a/packages/redux-routine/src/test/index.js +++ b/packages/redux-routine/src/test/index.js @@ -60,7 +60,7 @@ describe( 'createMiddleware', () => { try { yield { type: 'WAIT_FAIL' }; } catch ( error ) { - // eslint-disable-next-line jest/no-try-expect + // eslint-disable-next-line jest/no-try-expect, jest/no-conditional-expect expect( error ).toBe( 'Message' ); } } @@ -81,7 +81,7 @@ describe( 'createMiddleware', () => { try { yield { type: 'WAIT_FAIL' }; } catch ( error ) { - // eslint-disable-next-line jest/no-try-expect + // eslint-disable-next-line jest/no-try-expect, jest/no-conditional-expect expect( error.message ).toBe( 'Message' ); } } @@ -108,7 +108,7 @@ describe( 'createMiddleware', () => { try { yield { type: 'WAIT_FAIL' }; } catch ( error ) { - // eslint-disable-next-line jest/no-try-expect + // eslint-disable-next-line jest/no-try-expect, jest/no-conditional-expect expect( error.message ).toBe( 'Message' ); return null; } diff --git a/packages/rich-text/src/test/create.js b/packages/rich-text/src/test/create.js index 786e8dc732b28..b17e9b5ec96bd 100644 --- a/packages/rich-text/src/test/create.js +++ b/packages/rich-text/src/test/create.js @@ -38,6 +38,7 @@ describe( 'create', () => { return; } + // eslint-disable-next-line jest/valid-title it( description, () => { const element = createElement( document, html ); const range = createRange( element ); @@ -66,6 +67,7 @@ describe( 'create', () => { html, value: expectedValue, } ) => { + // eslint-disable-next-line jest/valid-title it( description, () => { if ( formatName ) { registerFormatType( formatName, formatType ); diff --git a/packages/rich-text/src/test/is-format-equal.js b/packages/rich-text/src/test/is-format-equal.js index 8925dcf6e7d1b..33328f6800f2b 100644 --- a/packages/rich-text/src/test/is-format-equal.js +++ b/packages/rich-text/src/test/is-format-equal.js @@ -65,6 +65,7 @@ describe( 'isFormatEqual', () => { ]; spec.forEach( ( { format1, format2, isEqual, description } ) => { + // eslint-disable-next-line jest/valid-title it( description, () => { expect( isFormatEqual( format1, format2 ) ).toBe( isEqual ); } ); diff --git a/packages/rich-text/src/test/to-dom.js b/packages/rich-text/src/test/to-dom.js index d021c479b47f6..1d318fca88512 100644 --- a/packages/rich-text/src/test/to-dom.js +++ b/packages/rich-text/src/test/to-dom.js @@ -23,6 +23,7 @@ describe( 'recordToDom', () => { spec.forEach( ( { description, multilineTag, record, startPath, endPath } ) => { + // eslint-disable-next-line jest/valid-title it( description, () => { const { body, selection } = toDom( { value: record, @@ -94,6 +95,7 @@ describe( 'applyValue', () => { ]; cases.forEach( ( { current, future, description, movedCount } ) => { + // eslint-disable-next-line jest/valid-title it( description, () => { const body = createElement( document, current ).cloneNode( true ); const futureBody = createElement( document, future ).cloneNode( diff --git a/packages/rich-text/src/test/to-html-string.js b/packages/rich-text/src/test/to-html-string.js index a355f0773f768..81388a3ac9c2c 100644 --- a/packages/rich-text/src/test/to-html-string.js +++ b/packages/rich-text/src/test/to-html-string.js @@ -42,6 +42,7 @@ describe( 'toHTMLString', () => { return; } + // eslint-disable-next-line jest/valid-title it( description, () => { if ( formatName ) { registerFormatType( formatName, formatType ); diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md index 785c5b02e6783..bded299467c0f 100644 --- a/packages/scripts/CHANGELOG.md +++ b/packages/scripts/CHANGELOG.md @@ -12,6 +12,7 @@ ### Enhancements - `wordpress` subfolder is no longer ignored when detecting files for testing, linting or formatting. +- The bundled `eslint` dependency has been updated from requiring `^7.1.0` to requiring `^7.17.0` ([#27965](https://github.com/WordPress/gutenberg/pull/27965)). ### Internal diff --git a/packages/scripts/package.json b/packages/scripts/package.json index b19611c3f0901..0d249378e5fc0 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -49,7 +49,7 @@ "cross-spawn": "^5.1.0", "css-loader": "^3.5.2", "dir-glob": "^3.0.1", - "eslint": "^7.1.0", + "eslint": "^7.17.0", "eslint-plugin-markdown": "^1.0.2", "ignore-emit-webpack-plugin": "^2.0.6", "jest": "^26.6.3", diff --git a/packages/server-side-render/src/test/index.js b/packages/server-side-render/src/test/index.js index 9bbce350ea2a9..60b2f89007ade 100644 --- a/packages/server-side-render/src/test/index.js +++ b/packages/server-side-render/src/test/index.js @@ -13,7 +13,7 @@ describe( 'rendererPath', () => { ); } ); - test( 'should format basic url params ', () => { + test( 'should format basic url params', () => { expect( rendererPath( 'core/test-block', { stringArg: 'test', @@ -26,7 +26,7 @@ describe( 'rendererPath', () => { ); } ); - test( 'should format object params ', () => { + test( 'should format object params', () => { expect( rendererPath( 'core/test-block', { objectArg: { diff --git a/packages/stylelint-config/test/__snapshots__/scss.js.snap b/packages/stylelint-config/test/__snapshots__/scss.js.snap new file mode 100644 index 0000000000000..7b12c9a863073 --- /dev/null +++ b/packages/stylelint-config/test/__snapshots__/scss.js.snap @@ -0,0 +1,62 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`flags warnings with invalid scss snapshot matches warnings 1`] = ` +Array [ + Object { + "column": 1, + "line": 14, + "rule": "scss/at-else-empty-line-before", + "severity": "error", + "text": "Unexpected empty line before @else (scss/at-else-empty-line-before)", + }, + Object { + "column": 2, + "line": 12, + "rule": "scss/at-if-closing-brace-newline-after", + "severity": "error", + "text": "Unexpected newline after \\"}\\" of @if statement (scss/at-if-closing-brace-newline-after)", + }, + Object { + "column": 2, + "line": 12, + "rule": "scss/at-if-closing-brace-space-after", + "severity": "error", + "text": "Expected single space after \\"}\\" of @if statement (scss/at-if-closing-brace-space-after)", + }, + Object { + "column": 1, + "line": 1, + "rule": "scss/at-rule-no-unknown", + "severity": "error", + "text": "Unexpected unknown at-rule \\"@unknown\\" (at-rule-no-unknown) (scss/at-rule-no-unknown)", + }, + Object { + "column": 2, + "line": 22, + "rule": "at-rule-empty-line-before", + "severity": "error", + "text": "Unexpected empty line before at-rule (at-rule-empty-line-before)", + }, + Object { + "column": 5, + "line": 14, + "rule": "block-opening-brace-space-before", + "severity": "error", + "text": "Expected single space before \\"{\\" (block-opening-brace-space-before)", + }, + Object { + "column": 15, + "line": 28, + "rule": "no-extra-semicolons", + "severity": "error", + "text": "Unexpected extra semicolon (no-extra-semicolons)", + }, + Object { + "column": 7, + "line": 31, + "rule": "number-leading-zero", + "severity": "error", + "text": "Expected a leading zero (number-leading-zero)", + }, +] +`; diff --git a/packages/stylelint-config/test/scss.js b/packages/stylelint-config/test/scss.js index c64537ee07e6b..9372d502b0d8a 100644 --- a/packages/stylelint-config/test/scss.js +++ b/packages/stylelint-config/test/scss.js @@ -58,10 +58,9 @@ describe( 'flags warnings with invalid scss', () => { ); } ); - // ToDo: Fix snapshot, as results differ between Node.js v10 & v12 - // it( 'snapshot matches warnings', () => { - // return result.then( ( data ) => ( - // expect( data.results[ 0 ].warnings ).toMatchSnapshot() - // ) ); - // } ); + it( 'snapshot matches warnings', () => { + return result.then( ( data ) => + expect( data.results[ 0 ].warnings ).toMatchSnapshot() + ); + } ); } ); diff --git a/packages/warning/test/babel-plugin.js b/packages/warning/test/babel-plugin.js index 6274f4308129e..afff2c4e273a1 100644 --- a/packages/warning/test/babel-plugin.js +++ b/packages/warning/test/babel-plugin.js @@ -80,7 +80,7 @@ describe( 'babel-plugin', () => { ); } ); - it( 'should identify warning callee name by ', () => { + it( 'should identify warning callee name by', () => { compare( join( 'import warn from "@wordpress/warning";', diff --git a/test/integration/blocks-raw-handling.test.js b/test/integration/blocks-raw-handling.test.js index 4c5129648bb30..2c869e071c4e9 100644 --- a/test/integration/blocks-raw-handling.test.js +++ b/test/integration/blocks-raw-handling.test.js @@ -383,6 +383,7 @@ describe( 'Blocks raw handling', () => { 'gutenberg', 'shortcode-matching', ].forEach( ( type ) => { + // eslint-disable-next-line jest/valid-title it( type, () => { const HTML = readFile( path.join( __dirname, `fixtures/${ type }-in.html` ) @@ -407,6 +408,7 @@ describe( 'Blocks raw handling', () => { expect( serialized ).toBe( output ); if ( type !== 'gutenberg' ) { + // eslint-disable-next-line jest/no-conditional-expect expect( console ).toHaveLogged(); } } ); diff --git a/test/integration/full-content/full-content.test.js b/test/integration/full-content/full-content.test.js index 5e896387b5662..549831ec25b0b 100644 --- a/test/integration/full-content/full-content.test.js +++ b/test/integration/full-content/full-content.test.js @@ -74,6 +74,7 @@ describe( 'full post content fixture', () => { } ); blockBasenames.forEach( ( basename ) => { + // eslint-disable-next-line jest/valid-title it( basename, () => { const { filename: htmlFixtureFileName,