Skip to content

Commit

Permalink
Rebase and test adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
ellatrix committed Jun 27, 2018
1 parent 0054f04 commit ebc5d75
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions editor/components/inserter/results-portal.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Expand All @@ -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>
);
} }
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/specs/adding-inline-tokens.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]' );
Expand All @@ -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 ) => {
Expand Down

0 comments on commit ebc5d75

Please sign in to comment.