Writing flow: add e2e tests for webkit and firefox (#53458)

WordPress · Aug 9, 2023 · 5ff4e28 · 5ff4e28
1 parent 4a24e85
commit 5ff4e28
Show file tree

Hide file tree

Showing 15 changed files with 167 additions and 183 deletions.
diff --git a/...us/__snapshots__/Writing-Flow-Should-navigate-inner-blocks-with-arrow-keys-1-chromium.txt b/...us/__snapshots__/Writing-Flow-Should-navigate-inner-blocks-with-arrow-keys-1-chromium.txt
diff --git a/...ting-Flow-should-create-valid-paragraph-blocks-when-rapidly-pressing-Enter-1-chromium.txt b/...ting-Flow-should-create-valid-paragraph-blocks-when-rapidly-pressing-Enter-1-chromium.txt
diff --git a/...arious/__snapshots__/Writing-Flow-should-navigate-around-inline-boundaries-1-chromium.txt b/...arious/__snapshots__/Writing-Flow-should-navigate-around-inline-boundaries-1-chromium.txt
diff --git a/...ots__/Writing-Flow-should-navigate-contenteditable-with-normal-line-height-1-chromium.txt b/...ots__/Writing-Flow-should-navigate-contenteditable-with-normal-line-height-1-chromium.txt
diff --git a/...us/__snapshots__/Writing-Flow-should-navigate-contenteditable-with-padding-1-chromium.txt b/...us/__snapshots__/Writing-Flow-should-navigate-contenteditable-with-padding-1-chromium.txt
diff --git a/...snapshots__/Writing-Flow-should-navigate-contenteditable-with-side-padding-1-chromium.txt b/...snapshots__/Writing-Flow-should-navigate-contenteditable-with-side-padding-1-chromium.txt
diff --git a/...tor/various/__snapshots__/Writing-Flow-should-not-prematurely-multi-select-1-chromium.txt b/...tor/various/__snapshots__/Writing-Flow-should-not-prematurely-multi-select-1-chromium.txt
diff --git a/...g-blocks-should-split-and-merge-paragraph-blocks-using-Enter-and-Backspace-1-chromium.txt b/...g-blocks-should-split-and-merge-paragraph-blocks-using-Enter-and-Backspace-1-chromium.txt
diff --git a/...ous/__snapshots__/splitting-and-merging-blocks-should-undo-split-in-one-go-1-chromium.txt b/...ous/__snapshots__/splitting-and-merging-blocks-should-undo-split-in-one-go-1-chromium.txt
diff --git a/...ocks-test-restore-sele-18edb-roduces-more-than-one-block-on-forward-delete-2-chromium.txt b/...ocks-test-restore-sele-18edb-roduces-more-than-one-block-on-forward-delete-2-chromium.txt
diff --git a/...ocks-test-restore-sele-2a1ee-roduces-more-than-one-block-on-forward-delete-1-chromium.txt b/...ocks-test-restore-sele-2a1ee-roduces-more-than-one-block-on-forward-delete-1-chromium.txt
diff --git a/...ocks-test-restore-sele-46dfa-rge-produces-more-than-one-block-on-backspace-2-chromium.txt b/...ocks-test-restore-sele-46dfa-rge-produces-more-than-one-block-on-backspace-2-chromium.txt
diff --git a/...ocks-test-restore-sele-92273-rge-produces-more-than-one-block-on-backspace-1-chromium.txt b/...ocks-test-restore-sele-92273-rge-produces-more-than-one-block-on-backspace-1-chromium.txt
diff --git a/test/e2e/specs/editor/various/splitting-merging.spec.js b/test/e2e/specs/editor/various/splitting-merging.spec.js
@@ -3,7 +3,7 @@
  */
 const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
-test.describe( 'splitting and merging blocks', () => {
+test.describe( 'splitting and merging blocks (@firefox, @webkit)', () => {
 	test.beforeEach( async ( { admin } ) => {
 		await admin.createNewPost();
 	} );
@@ -334,10 +334,17 @@ test.describe( 'splitting and merging blocks', () => {
 		await pageUtils.pressKeys( 'primary+z' );
 
 		// Check the content.
-		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: '12',
+				},
+			},
+		] );
 	} );
 
-	test( 'should not split with line break in front', async ( {
+	test( 'should not split with line break in front (-firefox)', async ( {
 		editor,
 		page,
 		pageUtils,
@@ -364,6 +371,52 @@ test.describe( 'splitting and merging blocks', () => {
 	} );
 
 	test.describe( 'test restore selection when merge produces more than one block', () => {
+		const snap1 = [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'hi',
+				},
+			},
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'item 1',
+				},
+			},
+			{
+				name: 'core/list',
+				innerBlocks: [
+					{
+						name: 'core/list-item',
+						attributes: {
+							content: 'item 2',
+						},
+					},
+				],
+			},
+		];
+
+		const snap2 = [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'hi-item 1',
+				},
+			},
+			{
+				name: 'core/list',
+				innerBlocks: [
+					{
+						name: 'core/list-item',
+						attributes: {
+							content: 'item 2',
+						},
+					},
+				],
+			},
+		];
+
 		test( 'on forward delete', async ( { editor, page, pageUtils } ) => {
 			await editor.insertBlock( { name: 'core/paragraph' } );
 			await page.keyboard.type( 'hi' );
@@ -374,14 +427,14 @@ test.describe( 'splitting and merging blocks', () => {
 			await pageUtils.pressKeys( 'ArrowUp', { times: 3 } );
 			await page.keyboard.press( 'Delete' );
 
-			expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+			expect( await editor.getBlocks() ).toMatchObject( snap1 );
 
 			await page.keyboard.press( 'Delete' );
 			// Carret should be in the first block and at the proper position.
 			await page.keyboard.type( '-' );
 
 			// Check the content.
-			expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+			expect( await editor.getBlocks() ).toMatchObject( snap2 );
 		} );
 
 		test( 'on backspace', async ( { editor, page, pageUtils } ) => {
@@ -395,14 +448,14 @@ test.describe( 'splitting and merging blocks', () => {
 			await pageUtils.pressKeys( 'ArrowLeft', { times: 6 } );
 			await page.keyboard.press( 'Backspace' );
 
-			expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+			expect( await editor.getBlocks() ).toMatchObject( snap1 );
 
 			await page.keyboard.press( 'Backspace' );
 			// Carret should be in the first block and at the proper position.
 			await page.keyboard.type( '-' );
 
 			// Check the content.
-			expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+			expect( await editor.getBlocks() ).toMatchObject( snap2 );
 		} );
 	} );
 } );