From ebc5d757fedb8d6b5c420736643ab7b33177e72b Mon Sep 17 00:00:00 2001
From: iseulde <wp@iseulde.com>
Date: Wed, 27 Jun 2018 17:03:23 +0200
Subject: [PATCH] Rebase and test adjustments

---
 editor/components/inserter/results-portal.js | 4 ++--
 test/e2e/specs/adding-inline-tokens.test.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/editor/components/inserter/results-portal.js b/editor/components/inserter/results-portal.js
index e42a75536faf4..80ef0ddcea508 100644
--- a/editor/components/inserter/results-portal.js
+++ b/editor/components/inserter/results-portal.js
@@ -6,7 +6,7 @@ import { createSlotFill, PanelBody } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import ItemList from './item-list';
+import BlockTypesList from '../block-types-list';
 import { searchItems } from './menu';
 
 const { Fill, Slot } = createSlotFill( 'InserterResultsPortal' );
@@ -25,7 +25,7 @@ const InserterResultsPortal = ( { items, title, onSelect, onHover } ) => {
 					<PanelBody
 						title={ title }
 					>
-						<ItemList items={ filteredItems } onSelect={ onSelect } onHover={ onHover } />
+						<BlockTypesList items={ filteredItems } onSelect={ onSelect } onHover={ onHover } />
 					</PanelBody>
 				);
 			} }
diff --git a/test/e2e/specs/adding-inline-tokens.test.js b/test/e2e/specs/adding-inline-tokens.test.js
index cf0b701cba97e..f1646df4a90fa 100644
--- a/test/e2e/specs/adding-inline-tokens.test.js
+++ b/test/e2e/specs/adding-inline-tokens.test.js
@@ -20,7 +20,7 @@ describe( 'adding inline tokens', () => {
 		await page.click( '.editor-default-block-appender' );
 		await page.keyboard.type( 'a ' );
 
-		insertBlock( 'Inline Image' );
+		await insertBlock( 'Inline Image' );
 
 		// Wait for media modal to appear and upload image.
 		await page.waitForSelector( '.media-modal input[type=file]' );
@@ -38,7 +38,7 @@ describe( 'adding inline tokens', () => {
 		expect( await getHTMLFromCodeEditor() ).toMatch( /<!-- wp:paragraph -->\s*<p>a\u00A0<img class="wp-image-\d+" style="width:10px" src="[^"]+\/10x10_e2e_test_image_z9T8jK\.png" alt="" \/><\/p>\s*<!-- \/wp:paragraph -->/ );
 
 		// Open the media modal again by inserting inline image
-		insertBlock( 'Inline Image' );
+		await insertBlock( 'Inline Image' );
 
 		// Confirm deletion.
 		page.on( 'dialog', async ( dialog ) => {