From 96782c9799aa9685779b6b5efe3e44e9548e7cb6 Mon Sep 17 00:00:00 2001 From: tellthemachines Date: Thu, 15 Oct 2020 14:48:49 +1100 Subject: [PATCH] Fix tests and snapshots. --- .../src/components/block-switcher/index.js | 2 +- .../block-switcher/test/__snapshots__/index.js.snap | 2 +- .../editor/various/keyboard-navigable-blocks.test.js | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js index d50d79eb8cbc78..5c6aa26e75d3e0 100644 --- a/packages/block-editor/src/components/block-switcher/index.js +++ b/packages/block-editor/src/components/block-switcher/index.js @@ -147,7 +147,7 @@ export class BlockSwitcher extends Component { const singleBlockLabel = isSmallScreen ? blockTitle - : `${ __( 'Change block type or style' ) } ( ${ blockTitle } )`; + : `${ __( 'Change block type or style' ) } ( ${ blockTitle } )`; const blockSwitcherLabel = 1 === blocks.length diff --git a/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap index 1e581dea70b8a3..15dfe116870c83 100644 --- a/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap +++ b/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap @@ -20,7 +20,7 @@ exports[`BlockSwitcher should render disabled block switcher with multi block of showColors={true} /> } - title="Block icon" + title="Heading" /> `; diff --git a/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js b/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js index 99a9be8268fe1a..0f6b9a16071b06 100644 --- a/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js +++ b/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js @@ -43,7 +43,9 @@ const tabThroughParagraphBlock = async ( paragraphText ) => { const tabThroughBlockToolbar = async () => { await page.keyboard.press( 'Tab' ); - await expect( await getActiveLabel() ).toBe( 'Change block type or style' ); + await expect( await getActiveLabel() ).toBe( + 'Change block type or style ( Paragraph )' + ); await page.keyboard.press( 'ArrowRight' ); await expect( await getActiveLabel() ).toBe( 'Move up' ); @@ -64,13 +66,15 @@ const tabThroughBlockToolbar = async () => { await expect( await getActiveLabel() ).toBe( 'Link' ); await page.keyboard.press( 'ArrowRight' ); - await expect( await getActiveLabel() ).toBe( 'More rich text controls' ); + await expect( await getActiveLabel() ).toBe( 'More formatting' ); await page.keyboard.press( 'ArrowRight' ); await expect( await getActiveLabel() ).toBe( 'More options' ); await page.keyboard.press( 'ArrowRight' ); - await expect( await getActiveLabel() ).toBe( 'Change block type or style' ); + await expect( await getActiveLabel() ).toBe( + 'Change block type or style ( Paragraph )' + ); }; describe( 'Order of block keyboard navigation', () => {