Fixed intermittent problem.

WordPress · Nov 27, 2019 · 6fe1c75 · 6fe1c75
1 parent b246c63
commit 6fe1c75
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/packages/e2e-tests/plugins/inner-blocks-renderappender.php b/packages/e2e-tests/plugins/inner-blocks-renderappender.php
@@ -16,7 +16,7 @@ function enqueue_inner_blocks_renderappender_script() {
 		plugins_url( 'inner-blocks-renderappender/index.js', __FILE__ ),
 		array(
 			'wp-blocks',
-			'wp-editor',
+			'wp-block-editor',
 			'wp-element',
 			'wp-i18n',
 			'wp-data',

diff --git a/packages/e2e-tests/plugins/inner-blocks-renderappender/index.js b/packages/e2e-tests/plugins/inner-blocks-renderappender/index.js
@@ -2,11 +2,11 @@
 	var wp = window.wp;
 	var registerBlockType = wp.blocks.registerBlockType;
 	var el = wp.element.createElement;
-	var InnerBlocks = wp.editor.InnerBlocks;
+	var InnerBlocks = wp.blockEditor.InnerBlocks;
 	var withSelect = wp.data.withSelect;
 
 	var dataSelector = withSelect( function( select, ownProps ) {
-		var getBlockOrder = select( 'core/editor' ).getBlockOrder;
+		var getBlockOrder = select( 'core/block-editor' ).getBlockOrder;
 		return {
 			numberOfChildren: getBlockOrder( ownProps.clientId ).length,
 		};
@@ -25,7 +25,7 @@
 	function emptyBlockAppender() {
 		return (
 			el( 'div', { className: 'my-dynamic-blocks-appender' },
-				el( 'span', {}, 'Empty Blocks Appender' ),
+				el( 'span', { className: 'empty-blocks-appender' }, 'Empty Blocks Appender' ),
 				el( InnerBlocks.ButtonBlockAppender )
 			)
 		);
@@ -34,7 +34,7 @@
 	function singleBlockAppender() {
 		return (
 			el( 'div', { className: 'my-dynamic-blocks-appender' },
-				el( 'span', {}, 'Single Blocks Appender' ),
+				el( 'span', { className: 'single-blocks-appender' }, 'Single Blocks Appender' ),
 				el( InnerBlocks.ButtonBlockAppender )
 			)
 		);
@@ -43,7 +43,7 @@
 	function multipleBlockAppender() {
 		return (
 			el( 'div', { className: 'my-dynamic-blocks-appender' },
-				el( 'span', {}, 'Multiple Blocks Appender' ),
+				el( 'span', { className: 'multiple-blocks-appender' }, 'Multiple Blocks Appender' ),
 			)
 		);
 	}

diff --git a/packages/e2e-tests/specs/plugins/inner-blocks-renderappender.test.js b/packages/e2e-tests/specs/plugins/inner-blocks-renderappender.test.js
@@ -11,6 +11,8 @@ import {
 	openAllBlockInserterCategories,
 } from '@wordpress/e2e-test-utils';
 
+const QUOTE_INSERT_BUTTON_SELECTOR = '//button[contains(concat(" ", @class, " "), " block-editor-block-types-list__item ")][./span[contains(text(),"Quote")]]';
+
 describe( 'RenderAppender prop of InnerBlocks ', () => {
 	beforeAll( async () => {
 		await activatePlugin( 'gutenberg-test-innerblocks-renderappender' );
@@ -42,7 +44,8 @@ describe( 'RenderAppender prop of InnerBlocks ', () => {
 			'Quote',
 			'Video',
 		] );
-		await page.click( `.block-editor-block-types-list__item[aria-label="Quote"]` );
+		const quoteButton = ( await page.$x( QUOTE_INSERT_BUTTON_SELECTOR ) )[ 0 ];
+		await quoteButton.click();
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
@@ -53,7 +56,7 @@ describe( 'RenderAppender prop of InnerBlocks ', () => {
 		expect(
 			await page.evaluate(
 				( el ) => ( el.innerText ),
-				await page.$( `${ dynamicAppenderSelector } > span` ) )
+				await page.$( `${ dynamicAppenderSelector } > span.empty-blocks-appender` ) )
 		).toEqual( 'Empty Blocks Appender' );
 		const blockAppenderButtonSelector = `${ dynamicAppenderSelector } .block-editor-button-block-appender`;
 		await page.click( blockAppenderButtonSelector );
@@ -64,11 +67,12 @@ describe( 'RenderAppender prop of InnerBlocks ', () => {
 			'Quote',
 			'Video',
 		] );
-		await page.click( `.block-editor-block-types-list__item[aria-label="Quote"]` );
+		const quoteButton = ( await page.$x( QUOTE_INSERT_BUTTON_SELECTOR ) )[ 0 ];
+		await quoteButton.click();
 		expect(
 			await page.evaluate(
 				( el ) => ( el.innerText ),
-				await page.$( `${ dynamicAppenderSelector } > span` ) )
+				await page.$( `${ dynamicAppenderSelector } > span.single-blocks-appender` ) )
 		).toEqual( 'Single Blocks Appender' );
 		expect(
 			await page.$( blockAppenderButtonSelector )
@@ -77,7 +81,7 @@ describe( 'RenderAppender prop of InnerBlocks ', () => {
 		expect(
 			await page.evaluate(
 				( el ) => ( el.innerText ),
-				await page.$( `${ dynamicAppenderSelector } > span` ) )
+				await page.$( `${ dynamicAppenderSelector } > span.multiple-blocks-appender` ) )
 		).toEqual( 'Multiple Blocks Appender' );
 		expect(
 			await page.$( blockAppenderButtonSelector )