From 0ddcb928432af3f0d165f6fa6ebf06ad922fa490 Mon Sep 17 00:00:00 2001 From: Ella van Durpe Date: Thu, 5 Dec 2019 14:24:09 +0100 Subject: [PATCH] Fix a few e2e tests --- .../specs/editor/various/adding-blocks.test.js | 8 ++++---- .../various/keyboard-navigable-blocks.test.js | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/e2e-tests/specs/editor/various/adding-blocks.test.js b/packages/e2e-tests/specs/editor/various/adding-blocks.test.js index c0e72c9dc63682..7accad3f66ee7c 100644 --- a/packages/e2e-tests/specs/editor/various/adding-blocks.test.js +++ b/packages/e2e-tests/specs/editor/various/adding-blocks.test.js @@ -91,12 +91,12 @@ describe( 'adding blocks', () => { // Unselect blocks to avoid conflicts with the inbetween inserter await page.click( '.editor-post-title__input' ); - // Using the between inserter - const insertionPoint = await page.$( '[data-type="core/quote"] .block-editor-inserter__toggle' ); + // Using the inserter between paragraph and quote + const insertionPoint = await page.$( '[data-type="core/paragraph"] ~ .block-editor-block-list__insertion-point .block-editor-inserter__toggle' ); const rect = await insertionPoint.boundingBox(); await page.mouse.move( rect.x + ( rect.width / 2 ), rect.y + ( rect.height / 2 ), { steps: 10 } ); - await page.waitForSelector( '[data-type="core/quote"] .block-editor-inserter__toggle' ); - await page.click( '[data-type="core/quote"] .block-editor-inserter__toggle' ); + await page.waitForSelector( '[data-type="core/paragraph"] ~ .block-editor-block-list__insertion-point .block-editor-inserter__toggle' ); + await page.click( '[data-type="core/paragraph"] ~ .block-editor-block-list__insertion-point .block-editor-inserter__toggle' ); // [TODO]: Search input should be focused immediately. It shouldn't be // necessary to have `waitForFunction`. await page.waitForFunction( () => ( 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 085ddea5128c20..aac70849d2caac 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 @@ -17,6 +17,13 @@ const navigateToContentEditorTop = async () => { }; const tabThroughParagraphBlock = async ( paragraphText ) => { + // Tab causes 'add block' button to receive focus + await page.keyboard.press( 'Tab' ); + const isFocusedParagraphInserterToggle = await page.evaluate( () => + document.activeElement.classList.contains( 'block-editor-inserter__toggle' ) + ); + await expect( isFocusedParagraphInserterToggle ).toBe( true ); + // Tab to the next paragraph block await page.keyboard.press( 'Tab' ); @@ -26,13 +33,6 @@ const tabThroughParagraphBlock = async ( paragraphText ) => { ); await expect( isFocusedParagraphBlock ).toEqual( 'core/paragraph' ); - // Tab causes 'add block' button to receive focus - await page.keyboard.press( 'Tab' ); - const isFocusedParagraphInserterToggle = await page.evaluate( () => - document.activeElement.classList.contains( 'block-editor-inserter__toggle' ) - ); - await expect( isFocusedParagraphInserterToggle ).toBe( true ); - await tabThroughBlockMoverControl(); await tabThroughBlockToolbar();