Fix movers e2e tests

WordPress · Feb 24, 2020 · b1f3a9d · b1f3a9d
1 parent ead309d
commit b1f3a9d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/packages/block-editor/src/components/block-toolbar/utils.js b/packages/block-editor/src/components/block-toolbar/utils.js
@@ -81,7 +81,7 @@ export function useShowMoversGestures( { ref, debounceTimeout = 500 } ) {
 	const registerRef = useRef( false );
 
 	const isFocusedWithin = () => {
-		return ref && ref.current.contains( document.activeElement );
+		return ref?.current && ref.current.contains( document.activeElement );
 	};
 
 	useEffect( () => {

diff --git a/packages/e2e-test-utils/src/click-block-toolbar-button.js b/packages/e2e-test-utils/src/click-block-toolbar-button.js
@@ -11,6 +11,15 @@ export async function clickBlockToolbarButton( buttonAriaLabel ) {
 		await page.mouse.move( 0, 0 );
 		await page.mouse.move( 10, 10 );
 	}
+
+	// Hover the block switcher to show the movers
+	const switcher = await page.$(
+		'.block-editor-block-toolbar .block-editor-block-toolbar__block-switcher-wrapper'
+	);
+	if ( switcher ) {
+		await switcher.hover();
+	}
+
 	await page.waitForSelector( BUTTON_SELECTOR );
 	await page.click( BUTTON_SELECTOR );
 }
diff --git a/packages/e2e-tests/plugins/disable-animations.php b/packages/e2e-tests/plugins/disable-animations.php
@@ -11,7 +11,7 @@
  * Enqueue CSS stylesheet disabling animations.
  */
 function enqueue_disable_animations_stylesheet() {
-	$custom_css = '* { animation-duration: 0ms !important; }';
+	$custom_css = '* { animation-duration: 0ms !important; transition-duration: 0s !important; }';
 	wp_add_inline_style( 'wp-components', $custom_css );
 }
 

diff --git a/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js b/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
@@ -42,6 +42,10 @@ describe( 'cpt locking', () => {
 		await page.click(
 			'.block-editor-rich-text__editable.wp-block-paragraph'
 		);
+		// Hover the block switcher to show the movers
+		await page.hover(
+			'.block-editor-block-toolbar .block-editor-block-toolbar__block-switcher-wrapper'
+		);
 		expect( await page.$( 'button[aria-label="Move up"]' ) ).not.toBeNull();
 		await page.click( 'button[aria-label="Move up"]' );
 		await page.type(