Update tests

WordPress · Jan 3, 2020 · 6d0cfbc · 6d0cfbc
1 parent d03c51c
commit 6d0cfbc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
@@ -147,12 +147,6 @@ function URLPicker( { isSelected, url, title, setAttributes, opensInNewTab, onTo
 		<>
 			<BlockControls>
 				<ToolbarGroup>
-					<KeyboardShortcuts
-						bindGlobal
-						shortcuts={ {
-							[ rawShortcut.primary( 'k' ) ]: openLinkControl,
-						} }
-					/>
 					<ToolbarButton
 						name="link"
 						icon="admin-links"
@@ -162,6 +156,12 @@ function URLPicker( { isSelected, url, title, setAttributes, opensInNewTab, onTo
 					/>
 				</ToolbarGroup>
 			</BlockControls>
+			<KeyboardShortcuts
+				bindGlobal
+				shortcuts={ {
+					[ rawShortcut.primary( 'k' ) ]: openLinkControl,
+				} }
+			/>
 			{ linkControl }
 		</>
 	);

diff --git a/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap b/packages/e2e-tests/specs/editor/blocks/__snapshots__/buttons.test.js.snap
@@ -1,13 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Buttons can jump focus back & forth 1`] = `
+exports[`Buttons can jump to the link editor using the keyboard shortcut 1`] = `
 "<!-- wp:buttons -->
 <div class=\\"wp-block-buttons\\"><!-- wp:button -->
 <div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link\\">WordPress</a></div>
-<!-- /wp:button -->
-
-<!-- wp:button -->
-<div class=\\"wp-block-button\\"><a class=\\"wp-block-button__link\\">Button!</a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;

diff --git a/packages/e2e-tests/specs/editor/blocks/buttons.test.js b/packages/e2e-tests/specs/editor/blocks/buttons.test.js
@@ -5,6 +5,7 @@ import {
 	insertBlock,
 	getEditedPostContent,
 	createNewPost,
+	pressKeyWithModifier,
 } from '@wordpress/e2e-test-utils';
 
 describe( 'Buttons', () => {
@@ -19,12 +20,12 @@ describe( 'Buttons', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
-	it( 'can jump focus back & forth', async () => {
+	it( 'can jump to the link editor using the keyboard shortcut', async () => {
 		await insertBlock( 'Buttons' );
 		await page.keyboard.type( 'WordPress' );
-		await page.keyboard.press( 'Tab' );
+		await pressKeyWithModifier( 'primary', 'k' );
+		await page.keyboard.type( 'https://wwww.wordpress.org/' );
 		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Button!' );
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );