Replace canvas.waitForFunction with expec.poll

WordPress · Sep 28, 2023 · a755917 · a755917
1 parent 687d6ea
commit a755917
Showing 1 changed file with 48 additions and 24 deletions.
diff --git a/test/e2e/specs/editor/various/copy-cut-paste.spec.js b/test/e2e/specs/editor/various/copy-cut-paste.spec.js
@@ -259,9 +259,13 @@ test.describe( 'Copy/cut/paste', () => {
 		await pageUtils.pressKeys( 'primary+ArrowLeft' );
 		// Sometimes the caret has not moved to the correct position before pressing Enter.
 		// @see https://github.com/WordPress/gutenberg/issues/40303#issuecomment-1109434887
-		await editor.canvas.waitForFunction(
-			() => window.getSelection().type === 'Caret'
-		);
+		await expect
+			.poll( async () =>
+				editor.canvas
+					.locator( ':root' )
+					.evaluate( () => window.getSelection().type )
+			)
+			.toBe( 'Caret' );
 		// Create a new block at the top of the document to paste there.
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.press( 'ArrowUp' );
@@ -287,9 +291,13 @@ test.describe( 'Copy/cut/paste', () => {
 		await pageUtils.pressKeys( 'primary+ArrowLeft' );
 		// Sometimes the caret has not moved to the correct position before pressing Enter.
 		// @see https://github.com/WordPress/gutenberg/issues/40303#issuecomment-1109434887
-		await editor.canvas.waitForFunction(
-			() => window.getSelection().type === 'Caret'
-		);
+		await expect
+			.poll( async () =>
+				editor.canvas
+					.locator( ':root' )
+					.evaluate( () => window.getSelection().type )
+			)
+			.toBe( 'Caret' );
 		// Create a new block at the top of the document to paste there.
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.press( 'ArrowUp' );
@@ -314,9 +322,13 @@ test.describe( 'Copy/cut/paste', () => {
 		await pageUtils.pressKeys( 'primary+ArrowLeft' );
 		// Sometimes the caret has not moved to the correct position before pressing Enter.
 		// @see https://github.com/WordPress/gutenberg/issues/40303#issuecomment-1109434887
-		await editor.canvas.waitForFunction(
-			() => window.getSelection().type === 'Caret'
-		);
+		await expect
+			.poll( async () =>
+				editor.canvas
+					.locator( ':root' )
+					.evaluate( () => window.getSelection().type )
+			)
+			.toBe( 'Caret' );
 		// Create a new block at the top of the document to paste there.
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.press( 'ArrowUp' );
@@ -342,9 +354,13 @@ test.describe( 'Copy/cut/paste', () => {
 		await pageUtils.pressKeys( 'primary+ArrowLeft' );
 		// Sometimes the caret has not moved to the correct position before pressing Enter.
 		// @see https://github.com/WordPress/gutenberg/issues/40303#issuecomment-1109434887
-		await editor.canvas.waitForFunction(
-			() => window.getSelection().type === 'Caret'
-		);
+		await expect
+			.poll( async () =>
+				editor.canvas
+					.locator( ':root' )
+					.evaluate( () => window.getSelection().type )
+			)
+			.toBe( 'Caret' );
 		// Create a new block at the top of the document to paste there.
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.press( 'ArrowUp' );
@@ -369,9 +385,13 @@ test.describe( 'Copy/cut/paste', () => {
 		await pageUtils.pressKeys( 'primary+ArrowLeft' );
 		// Sometimes the caret has not moved to the correct position before pressing Enter.
 		// @see https://github.com/WordPress/gutenberg/issues/40303#issuecomment-1109434887
-		await editor.canvas.waitForFunction(
-			() => window.getSelection().type === 'Caret'
-		);
+		await expect
+			.poll( async () =>
+				editor.canvas
+					.locator( ':root' )
+					.evaluate( () => window.getSelection().type )
+			)
+			.toBe( 'Caret' );
 		// Create a new block at the top of the document to paste there.
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.press( 'ArrowUp' );
@@ -396,9 +416,13 @@ test.describe( 'Copy/cut/paste', () => {
 		await pageUtils.pressKeys( 'primary+ArrowLeft' );
 		// Sometimes the caret has not moved to the correct position before pressing Enter.
 		// @see https://github.com/WordPress/gutenberg/issues/40303#issuecomment-1109434887
-		await editor.canvas.waitForFunction(
-			() => window.getSelection().type === 'Caret'
-		);
+		await expect
+			.poll( async () =>
+				editor.canvas
+					.locator( ':root' )
+					.evaluate( () => window.getSelection().type )
+			)
+			.toBe( 'Caret' );
 		// Create a new code block to paste there.
 		await editor.insertBlock( { name: 'core/code' } );
 		await pageUtils.pressKeys( 'primary+v' );
@@ -420,9 +444,9 @@ test.describe( 'Copy/cut/paste', () => {
 		await pageUtils.pressKeys( 'primary+v' );
 		// Expect the span to be filtered out.
 		expect(
-			await editor.canvas.evaluate(
-				() => document.activeElement.innerHTML
-			)
+			await editor.canvas
+				.locator( ':root' )
+				.evaluate( () => document.activeElement.innerHTML )
 		).toMatchSnapshot();
 	} );
 
@@ -440,9 +464,9 @@ test.describe( 'Copy/cut/paste', () => {
 		// Ensure the selection is correct.
 		await page.keyboard.type( 'y' );
 		expect(
-			await editor.canvas.evaluate(
-				() => document.activeElement.innerHTML
-			)
+			await editor.canvas
+				.locator( ':root' )
+				.evaluate( () => document.activeElement.innerHTML )
 		).toBe( 'axyb' );
 	} );