Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update: Use escape key press instead of mouse movement to show block toolbar #14247

Merged
merged 1 commit into from
Mar 5, 2019
Merged

Update: Use escape key press instead of mouse movement to show block toolbar #14247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/e2e-tests/specs/blocks/list.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ describe( 'List', () => {
await page.keyboard.press( 'Enter' );
// Pointer device is needed. Shift+Tab won't focus the toolbar.
// To do: fix so Shift+Tab works.
await page.mouse.move( 200, 300, { steps: 10 } );
await page.mouse.move( 250, 350, { steps: 10 } );
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );
await page.click( 'button[aria-label="Indent list item"]' );
await page.keyboard.type( 'two' );
await transformBlockTo( 'Paragraph' );
Expand Down Expand Up @@ -200,8 +200,8 @@ describe( 'List', () => {
await page.keyboard.press( 'Enter' );
// Pointer device is needed. Shift+Tab won't focus the toolbar.
// To do: fix so Shift+Tab works.
await page.mouse.move( 200, 300, { steps: 10 } );
await page.mouse.move( 250, 350, { steps: 10 } );
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );
await page.click( 'button[aria-label="Indent list item"]' );
await page.keyboard.type( 'two' );
await page.keyboard.press( 'Enter' );
Expand Down Expand Up @@ -235,8 +235,8 @@ describe( 'List', () => {

// Pointer device is needed. Shift+Tab won't focus the toolbar.
// To do: fix so Shift+Tab works.
await page.mouse.move( 200, 300, { steps: 10 } );
await page.mouse.move( 250, 350, { steps: 10 } );
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );

await page.click( 'button[aria-label="Convert to ordered list"]' );

Expand Down
3 changes: 2 additions & 1 deletion packages/e2e-tests/specs/invalid-block.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ describe( 'invalid blocks', () => {
await clickBlockAppender();
await page.keyboard.type( 'hello' );

// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );
// Click the 'more options'
await page.mouse.move( 200, 300, { steps: 10 } );
await page.click( 'button[aria-label="More options"]' );

// Change to HTML mode and close the options
Expand Down
16 changes: 6 additions & 10 deletions packages/e2e-tests/specs/links.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ describe( 'Links', () => {
await page.waitForFunction( () => !! document.activeElement.closest( '.editor-url-input' ) );
};

const moveMouse = async () => {
await page.mouse.move( 200, 300, { steps: 10 } );
await page.mouse.move( 250, 350, { steps: 10 } );
};

it( 'can be created by selecting text and clicking Link', async () => {
// Create a block with some text
await clickBlockAppender();
Expand Down Expand Up @@ -82,8 +77,8 @@ describe( 'Links', () => {
await clickBlockAppender();
await page.keyboard.type( 'This is Gutenberg: ' );

// Trigger isTyping = false
await moveMouse();
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );

// Press Cmd+K to insert a link
await pressKeyWithModifier( 'primary', 'K' );
Expand Down Expand Up @@ -224,8 +219,8 @@ describe( 'Links', () => {
await clickBlockAppender();
await page.keyboard.type( 'Text' );

// we need to trigger isTyping = false
await moveMouse();
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );
await page.waitForSelector( 'button[aria-label="Link"]' );
await page.click( 'button[aria-label="Link"]' );

Expand All @@ -245,7 +240,8 @@ describe( 'Links', () => {
// Make a collapsed selection inside the link
await page.keyboard.press( 'ArrowLeft' );
await page.keyboard.press( 'ArrowRight' );
await moveMouse();
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );
await page.click( 'button[aria-label="Edit"]' );
await waitForAutoFocus();
await page.keyboard.type( '/handbook' );
Expand Down
6 changes: 4 additions & 2 deletions packages/e2e-tests/specs/plugins/format-api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ describe( 'Using Format API', () => {
it( 'Format toolbar is present in a paragraph block', async () => {
await clickBlockAppender();
await page.keyboard.type( 'First paragraph' );
await page.mouse.move( 200, 300, { steps: 10 } );
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );
expect( await page.$( '[aria-label="Custom Link"]' ) ).not.toBeNull();
} );

Expand All @@ -35,7 +36,8 @@ describe( 'Using Format API', () => {
await page.keyboard.type( 'First paragraph' );
await pressKeyWithModifier( 'shiftAlt', 'ArrowLeft' );
await pressKeyWithModifier( 'primary', 'A' );
await page.mouse.move( 200, 300, { steps: 10 } );
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );
await page.click( '[aria-label="Custom Link"]' );
expect( await getEditedPostContent() ).toMatchSnapshot();
} );
Expand Down
14 changes: 4 additions & 10 deletions packages/e2e-tests/specs/reusable-blocks.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ describe( 'Reusable Blocks', () => {
await insertBlock( 'Paragraph' );
await page.keyboard.type( 'Hello there!' );

// Trigger isTyping = false
await page.mouse.move( 200, 300, { steps: 10 } );
await page.mouse.move( 250, 350, { steps: 10 } );
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );

// Convert block to a reusable block
await page.waitForSelector( 'button[aria-label="More options"]' );
Expand Down Expand Up @@ -81,9 +80,8 @@ describe( 'Reusable Blocks', () => {
await insertBlock( 'Paragraph' );
await page.keyboard.type( 'Hello there!' );

// Trigger isTyping = false
await page.mouse.move( 200, 300, { steps: 10 } );
await page.mouse.move( 250, 350, { steps: 10 } );
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );

// Convert block to a reusable block
await page.waitForSelector( 'button[aria-label="More options"]' );
Expand Down Expand Up @@ -222,10 +220,6 @@ describe( 'Reusable Blocks', () => {
await pressKeyWithModifier( 'primary', 'a' );
await pressKeyWithModifier( 'primary', 'a' );

// Trigger isTyping = false
await page.mouse.move( 200, 300, { steps: 10 } );
await page.mouse.move( 250, 350, { steps: 10 } );

// Convert block to a reusable block
await page.waitForSelector( 'button[aria-label="More options"]' );
await page.click( 'button[aria-label="More options"]' );
Expand Down
5 changes: 2 additions & 3 deletions packages/e2e-tests/specs/style-variation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ describe( 'adding blocks', () => {
await insertBlock( 'Quote' );
await page.keyboard.type( 'Quote content' );

// we need to trigger isTyping = false
await page.mouse.move( 200, 300, { steps: 10 } );
await page.mouse.move( 250, 350, { steps: 10 } );
// Press escape to show the block toolbar
await page.keyboard.press( 'Escape' );

// Use a different style variation
await page.waitForSelector( 'button[aria-label="Change block type"]' );
Expand Down