Fix e2e tests

WordPress · Aug 17, 2021 · b6ffc61 · b6ffc61
1 parent 065032c
commit b6ffc61
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/packages/e2e-tests/specs/editor/blocks/post-title.test.js b/packages/e2e-tests/specs/editor/blocks/post-title.test.js
@@ -28,7 +28,7 @@ describe( 'Post Title block', () => {
 		await page.waitForSelector( '.edit-post-layout' );
 		const title = await page.$eval(
 			'.editor-post-title__input',
-			( element ) => element.value
+			( element ) => element.textContent
 		);
 		expect( title ).toEqual( 'Just tweaking the post title' );
 	} );

diff --git a/packages/e2e-tests/specs/editor/various/change-detection.test.js b/packages/e2e-tests/specs/editor/various/change-detection.test.js
@@ -331,7 +331,7 @@ describe( 'Change detection', () => {
 		// Verify that the title is empty.
 		const title = await page.$eval(
 			'.editor-post-title__input',
-			( element ) => element.innerHTML
+			( element ) => element.textContent
 		);
 		expect( title ).toBe( '' );
 

diff --git a/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js b/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js
@@ -116,7 +116,7 @@ describe( 'Order of block keyboard navigation', () => {
 		await page.keyboard.press( 'Tab' );
 		await expect(
 			await page.evaluate( () => {
-				return document.activeElement.placeholder;
+				return document.activeElement.getAttribute( 'aria-label' );
 			} )
 		).toBe( 'Add title' );
 
@@ -168,7 +168,7 @@ describe( 'Order of block keyboard navigation', () => {
 		await pressKeyWithModifier( 'shift', 'Tab' );
 		await expect(
 			await page.evaluate( () => {
-				return document.activeElement.placeholder;
+				return document.activeElement.getAttribute( 'aria-label' );
 			} )
 		).toBe( 'Add title' );
 	} );

diff --git a/packages/editor/src/components/post-title/index.js b/packages/editor/src/components/post-title/index.js
@@ -92,13 +92,16 @@ export default function PostTitle() {
 		editPost( { title: newTitle } );
 	}
 
+	const [ selection, setSelection ] = useState( {} );
+
 	function onSelect() {
 		setIsSelected( true );
 		clearSelectedBlock();
 	}
 
 	function onUnselect() {
 		setIsSelected( false );
+		setSelection( {} );
 	}
 
 	function onChange( value ) {
@@ -172,12 +175,12 @@ export default function PostTitle() {
 			'has-fixed-toolbar': hasFixedToolbar,
 		}
 	);
-	const decodedPlaceholder = decodeEntities( placeholder );
-	const [ selection, setSelection ] = useState( {} );
+	const decodedPlaceholder =
+		decodeEntities( placeholder ) || __( 'Add title' );
 	const { ref: richTextRef } = useRichText( {
 		value: title,
 		onChange,
-		placeholder: decodedPlaceholder || __( 'Add title' ),
+		placeholder: decodedPlaceholder,
 		selectionStart: selection.start,
 		selectionEnd: selection.end,
 		onSelectionChange( newStart, newEnd ) {
@@ -204,6 +207,7 @@ export default function PostTitle() {
 					ref={ useMergeRefs( [ richTextRef, ref ] ) }
 					contentEditable
 					className="editor-post-title__input rich-text"
+					aria-label={ decodedPlaceholder }
 					onFocus={ onSelect }
 					onBlur={ onUnselect }
 					onKeyDown={ onKeyDown }