@wordpress/e2e-tests 5.0.0 → 5.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "5.0.0",
+	"version": "5.1.0",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -23,11 +23,11 @@
 		"node": ">=14"
 	},
 	"dependencies": {
-		"@wordpress/e2e-test-utils": "^8.0.0",
+		"@wordpress/e2e-test-utils": "^8.1.0",
 		"@wordpress/jest-console": "^6.0.0",
 		"@wordpress/jest-puppeteer-axe": "^5.0.0",
-		"@wordpress/scripts": "^24.0.0",
-		"@wordpress/url": "^3.17.0",
+		"@wordpress/scripts": "^24.1.0",
+		"@wordpress/url": "^3.18.0",
 		"chalk": "^4.0.0",
 		"expect-puppeteer": "^4.4.0",
 		"filenamify": "^4.2.0",
@@ -46,5 +46,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "171b87c7465b93e685e081c5f57f153507363c95"
+	"gitHead": "0d732d4b184adcb28cc83087603e81b764390d4b"
 }

package/specs/editor/blocks/navigation.test.js

@@ -278,8 +278,9 @@ async function waitForBlock( blockName ) {
 }
 
 // Disable reason - these tests are to be re-written.
+// Skipped temporarily due to issues with GH actions: https://wordpress.slack.com/archives/C02QB2JS7/p1661331673166269.
 // eslint-disable-next-line jest/no-disabled-tests
-describe( 'Navigation', () => {
+describe.skip( 'Navigation', () => {
 	const contributorUsername = `contributoruser_${ ++uniqueId }`;
 	let contributorPassword;
 
@@ -1681,10 +1682,7 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			);
 		} );
 
-		// Skip reason: running it in interactive works but selecting and
-		// checking for focus consistently fails in the test.
-		// eslint-disable-next-line jest/no-disabled-tests
-		it.skip( 'should always focus select menu button after item selection', async () => {
+		it( 'should always focus select menu button after item selection', async () => {
 			// Create some navigation menus to work with.
 			await createNavigationMenu( {
 				title: 'First navigation',
@@ -1712,7 +1710,7 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			const theOption = await page.waitForXPath(
 				"//button[@aria-checked='false'][contains(., 'First navigation')]"
 			);
-			theOption.click();
+			await theOption.click();
 
 			// Once the options are closed, does select menu button receive focus?
 			const selectMenuDropdown2 = await page.$(

package/specs/editor/plugins/__snapshots__/cpt-locking.test.js.snap

@@ -84,7 +84,9 @@ exports[`cpt locking template_lock false should allow blocks to be inserted 1`]
 <!-- /wp:columns -->
 
 <!-- wp:list -->
-<ul><li>List content</li></ul>
+<ul><!-- wp:list-item -->
+<li>List content</li>
+<!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
 `;
 

package/specs/editor/plugins/__snapshots__/plugins-api.test.js.snap

@@ -2,6 +2,6 @@
 
 exports[`Using Plugins API Document Setting Custom Panel Should render a custom panel inside Document Setting sidebar 1`] = `"My Custom Panel"`;
 
-exports[`Using Plugins API Sidebar Medium screen Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header interface-complementary-area-header__small\\"><span class=\\"interface-complementary-area-header__small-title\\">(no title)</span><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel__header interface-complementary-area-header\\" tabindex=\\"-1\\"><strong>Plugin sidebar title</strong><button type=\\"button\\" aria-pressed=\\"true\\" aria-expanded=\\"true\\" class=\\"components-button interface-complementary-area__pin-unpin-item is-pressed has-icon\\" aria-label=\\"Unpin from toolbar\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M11.776 4.454a.25.25 0 01.448 0l2.069 4.192a.25.25 0 00.188.137l4.626.672a.25.25 0 01.139.426l-3.348 3.263a.25.25 0 00-.072.222l.79 4.607a.25.25 0 01-.362.263l-4.138-2.175a.25.25 0 00-.232 0l-4.138 2.175a.25.25 0 01-.363-.263l.79-4.607a.25.25 0 00-.071-.222L4.754 9.881a.25.25 0 01.139-.426l4.626-.672a.25.25 0 00.188-.137l2.069-4.192z\\"></path></svg></button><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body sidebar-title-plugin-panel is-opened\\"><div class=\\"components-panel__row\\"><label for=\\"title-plain-text\\">Title:</label><textarea class=\\"block-editor-plain-text\\" id=\\"title-plain-text\\" placeholder=\\"(no title)\\" rows=\\"1\\" style=\\"overflow: hidden; overflow-wrap: break-word; resize: none; height: 18px;\\"></textarea></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-primary\\">Reset</button></div></div></div>"`;
+exports[`Using Plugins API Sidebar Medium screen Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header interface-complementary-area-header__small\\"><span class=\\"interface-complementary-area-header__small-title\\">(no title)</span><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" width=\\"24\\" height=\\"24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel__header interface-complementary-area-header\\" tabindex=\\"-1\\"><strong>Plugin sidebar title</strong><button type=\\"button\\" aria-pressed=\\"true\\" aria-expanded=\\"true\\" class=\\"components-button interface-complementary-area__pin-unpin-item is-pressed has-icon\\" aria-label=\\"Unpin from toolbar\\"><svg xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" width=\\"24\\" height=\\"24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M11.776 4.454a.25.25 0 01.448 0l2.069 4.192a.25.25 0 00.188.137l4.626.672a.25.25 0 01.139.426l-3.348 3.263a.25.25 0 00-.072.222l.79 4.607a.25.25 0 01-.362.263l-4.138-2.175a.25.25 0 00-.232 0l-4.138 2.175a.25.25 0 01-.363-.263l.79-4.607a.25.25 0 00-.071-.222L4.754 9.881a.25.25 0 01.139-.426l4.626-.672a.25.25 0 00.188-.137l2.069-4.192z\\"></path></svg></button><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" width=\\"24\\" height=\\"24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body sidebar-title-plugin-panel is-opened\\"><div class=\\"components-panel__row\\"><label for=\\"title-plain-text\\">Title:</label><textarea class=\\"block-editor-plain-text\\" id=\\"title-plain-text\\" placeholder=\\"(no title)\\" rows=\\"1\\" style=\\"overflow: hidden; overflow-wrap: break-word; resize: none; height: 18px;\\"></textarea></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-primary\\">Reset</button></div></div></div>"`;
 
-exports[`Using Plugins API Sidebar Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header interface-complementary-area-header__small\\"><span class=\\"interface-complementary-area-header__small-title\\">(no title)</span><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel__header interface-complementary-area-header\\" tabindex=\\"-1\\"><strong>Plugin sidebar title</strong><button type=\\"button\\" aria-pressed=\\"true\\" aria-expanded=\\"true\\" class=\\"components-button interface-complementary-area__pin-unpin-item is-pressed has-icon\\" aria-label=\\"Unpin from toolbar\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M11.776 4.454a.25.25 0 01.448 0l2.069 4.192a.25.25 0 00.188.137l4.626.672a.25.25 0 01.139.426l-3.348 3.263a.25.25 0 00-.072.222l.79 4.607a.25.25 0 01-.362.263l-4.138-2.175a.25.25 0 00-.232 0l-4.138 2.175a.25.25 0 01-.363-.263l.79-4.607a.25.25 0 00-.071-.222L4.754 9.881a.25.25 0 01.139-.426l4.626-.672a.25.25 0 00.188-.137l2.069-4.192z\\"></path></svg></button><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg width=\\"24\\" height=\\"24\\" xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body sidebar-title-plugin-panel is-opened\\"><div class=\\"components-panel__row\\"><label for=\\"title-plain-text\\">Title:</label><textarea class=\\"block-editor-plain-text\\" id=\\"title-plain-text\\" placeholder=\\"(no title)\\" rows=\\"1\\" style=\\"overflow: hidden; overflow-wrap: break-word; resize: none; height: 18px;\\"></textarea></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-primary\\">Reset</button></div></div></div>"`;
+exports[`Using Plugins API Sidebar Should open plugins sidebar using More Menu item and render content 1`] = `"<div class=\\"components-panel__header interface-complementary-area-header__small\\"><span class=\\"interface-complementary-area-header__small-title\\">(no title)</span><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" width=\\"24\\" height=\\"24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel__header interface-complementary-area-header\\" tabindex=\\"-1\\"><strong>Plugin sidebar title</strong><button type=\\"button\\" aria-pressed=\\"true\\" aria-expanded=\\"true\\" class=\\"components-button interface-complementary-area__pin-unpin-item is-pressed has-icon\\" aria-label=\\"Unpin from toolbar\\"><svg xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" width=\\"24\\" height=\\"24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M11.776 4.454a.25.25 0 01.448 0l2.069 4.192a.25.25 0 00.188.137l4.626.672a.25.25 0 01.139.426l-3.348 3.263a.25.25 0 00-.072.222l.79 4.607a.25.25 0 01-.362.263l-4.138-2.175a.25.25 0 00-.232 0l-4.138 2.175a.25.25 0 01-.363-.263l.79-4.607a.25.25 0 00-.071-.222L4.754 9.881a.25.25 0 01.139-.426l4.626-.672a.25.25 0 00.188-.137l2.069-4.192z\\"></path></svg></button><button type=\\"button\\" class=\\"components-button has-icon\\" aria-label=\\"Close plugin\\"><svg xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 24 24\\" width=\\"24\\" height=\\"24\\" aria-hidden=\\"true\\" focusable=\\"false\\"><path d=\\"M12 13.06l3.712 3.713 1.061-1.06L13.061 12l3.712-3.712-1.06-1.06L12 10.938 8.288 7.227l-1.061 1.06L10.939 12l-3.712 3.712 1.06 1.061L12 13.061z\\"></path></svg></button></div><div class=\\"components-panel\\"><div class=\\"components-panel__body sidebar-title-plugin-panel is-opened\\"><div class=\\"components-panel__row\\"><label for=\\"title-plain-text\\">Title:</label><textarea class=\\"block-editor-plain-text\\" id=\\"title-plain-text\\" placeholder=\\"(no title)\\" rows=\\"1\\" style=\\"overflow: hidden; overflow-wrap: break-word; resize: none; height: 18px;\\"></textarea></div><div class=\\"components-panel__row\\"><button type=\\"button\\" class=\\"components-button is-primary\\">Reset</button></div></div></div>"`;

package/specs/editor/plugins/cpt-locking.test.js

@@ -119,22 +119,22 @@ describe( 'cpt locking', () => {
 			);
 		} );
 
-		it( 'can use the global inserter in inner blocks', async () => {
+		it( 'should not allow blocks to be inserted in inner blocks', async () => {
 			await page.click( 'button[aria-label="Two columns; equal split"]' );
-			await page.click(
-				'.wp-block-column .block-editor-button-block-appender'
-			);
-			await page.type( '.block-editor-inserter__search input', 'image' );
-			await pressKeyTimes( 'Tab', 2 );
-			await page.keyboard.press( 'Enter' );
-			await page.click( '.edit-post-header-toolbar__inserter-toggle' );
-			await page.type(
-				'.block-editor-inserter__search input',
-				'gallery'
-			);
-			await pressKeyTimes( 'Tab', 2 );
-			await page.keyboard.press( 'Enter' );
-			expect( await page.$( '.wp-block-gallery' ) ).not.toBeNull();
+			expect(
+				await page.$(
+					'.wp-block-column .block-editor-button-block-appender'
+				)
+			).toBeNull();
+
+			expect(
+				await page.evaluate( () => {
+					const inserter = document.querySelector(
+						'.edit-post-header [aria-label="Add block"], .edit-post-header [aria-label="Toggle block inserter"]'
+					);
+					return inserter.getAttribute( 'disabled' );
+				} )
+			).not.toBeNull();
 		} );
 	} );
 

package/specs/editor/plugins/iframed-block.test.js

@@ -7,9 +7,8 @@ import {
 	deactivatePlugin,
 	insertBlock,
 	getEditedPostContent,
-	openDocumentSettingsSidebar,
-	clickButton,
 	canvas,
+	createNewTemplate,
 } from '@wordpress/e2e-test-utils';
 
 describe( 'changing image size', () => {
@@ -34,16 +33,7 @@ describe( 'changing image size', () => {
 
 		expect( text ).toBe( 'Iframed Block (set with jQuery)' );
 
-		await openDocumentSettingsSidebar();
-		await clickButton( 'Page' );
-		await page.click( 'button[aria-label^="Select template"]' );
-		await page.waitForSelector( 'button[aria-label="Add template"]' );
-		await page.click( 'button[aria-label="Add template"]' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.type( 'Iframed Test' );
-		await clickButton( 'Create' );
-		await page.waitForSelector( 'iframe[name="editor-canvas"]' );
+		await createNewTemplate( 'Iframed Test' );
 
 		const iframeElement = await canvas().waitForSelector(
 			'.wp-block-test-iframed-block'

package/specs/editor/plugins/iframed-inline-styles.test.js

@@ -7,9 +7,8 @@ import {
 	deactivatePlugin,
 	insertBlock,
 	getEditedPostContent,
-	openDocumentSettingsSidebar,
-	clickButton,
 	canvas,
+	createNewTemplate,
 } from '@wordpress/e2e-test-utils';
 
 async function getComputedStyle( context, property ) {
@@ -33,22 +32,14 @@ describe( 'iframed inline styles', () => {
 	} );
 
 	// Skip flaky test. See https://github.com/WordPress/gutenberg/issues/35172
-	it.skip( 'should load inline styles in iframe', async () => {
+	it( 'should load inline styles in iframe', async () => {
 		await insertBlock( 'Iframed Inline Styles' );
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 		expect( await getComputedStyle( page, 'padding' ) ).toBe( '20px' );
 		expect( await getComputedStyle( page, 'border-width' ) ).toBe( '2px' );
 
-		await openDocumentSettingsSidebar();
-		await clickButton( 'Page' );
-		await clickButton( 'Template' );
-		await clickButton( 'New' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.type( 'Iframed Test' );
-		await clickButton( 'Create' );
-		await page.waitForSelector( 'iframe[name="editor-canvas"]' );
+		await createNewTemplate( 'Iframed Test' );
 
 		// Inline styles of properly enqueued stylesheet should load.
 		expect( await getComputedStyle( canvas(), 'padding' ) ).toBe( '20px' );

package/specs/editor/plugins/iframed-masonry-block.test.js

@@ -7,9 +7,8 @@ import {
 	deactivatePlugin,
 	insertBlock,
 	getEditedPostContent,
-	openDocumentSettingsSidebar,
-	clickButton,
 	canvas,
+	createNewTemplate,
 } from '@wordpress/e2e-test-utils';
 
 async function didMasonryLoadCorrectly( context ) {
@@ -42,16 +41,7 @@ describe( 'iframed masonry block', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 		expect( await didMasonryLoadCorrectly( page ) ).toBe( true );
 
-		await openDocumentSettingsSidebar();
-		await clickButton( 'Page' );
-		await page.click( 'button[aria-label^="Select template"]' );
-		await page.waitForSelector( 'button[aria-label="Add template"]' );
-		await page.click( 'button[aria-label="Add template"]' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.type( 'Iframed Test' );
-		await clickButton( 'Create' );
-		await page.waitForSelector( 'iframe[name="editor-canvas"]' );
+		await createNewTemplate( 'Iframed Test' );
 		await canvas().waitForSelector( '.grid-item[style]' );
 
 		expect( await didMasonryLoadCorrectly( canvas() ) ).toBe( true );

package/specs/editor/plugins/iframed-multiple-block-stylesheets.test.js

@@ -6,9 +6,8 @@ import {
 	createNewPost,
 	deactivatePlugin,
 	insertBlock,
-	openDocumentSettingsSidebar,
-	clickButton,
 	canvas,
+	createNewTemplate,
 } from '@wordpress/e2e-test-utils';
 
 async function getComputedStyle( context, property ) {
@@ -33,21 +32,13 @@ describe( 'iframed multiple block stylesheets', () => {
 		await deactivatePlugin( 'gutenberg-test-iframed-multiple-stylesheets' );
 	} );
 
-	it.skip( 'should load multiple block stylesheets in iframe', async () => {
+	it( 'should load multiple block stylesheets in iframe', async () => {
 		await insertBlock( 'Iframed Multiple Stylesheets' );
 
 		await page.waitForSelector(
 			'.wp-block-test-iframed-multiple-stylesheets'
 		);
-		await openDocumentSettingsSidebar();
-		await clickButton( 'Page' );
-		await clickButton( 'Template' );
-		await clickButton( 'New' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.type( 'Iframed Test' );
-		await clickButton( 'Create' );
-		await page.waitForSelector( 'iframe[name="editor-canvas"]' );
+		await createNewTemplate( 'Iframed Test' );
 
 		// Style loaded from the main stylesheet.
 		expect( await getComputedStyle( canvas(), 'border-style' ) ).toBe(

package/specs/editor/plugins/inner-blocks-allowed-blocks.test.js

@@ -75,6 +75,9 @@ describe( 'Allowed Blocks Setting on InnerBlocks', () => {
 			await page.$x( `//button//span[contains(text(), 'List')]` )
 		 )[ 0 ];
 		await insertButton.click();
+		// Select the list wrapper so the image is inserable.
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'ArrowUp' );
 		await insertBlock( 'Image' );
 		await closeGlobalBlockInserter();
 		await page.waitForSelector( '.product[data-number-of-children="2"]' );

package/specs/editor/various/__snapshots__/block-deletion.test.js.snap

@@ -24,7 +24,9 @@ exports[`block deletion - deleting the third and fourth blocks using backspace w
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><li>caret was here</li></ul>
+<ul><!-- wp:list-item -->
+<li>caret was here</li>
+<!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
 `;
 

package/specs/editor/various/__snapshots__/keep-styles-on-block-transforms.test.js.snap

@@ -6,12 +6,6 @@ exports[`Keep styles on block transforms Should keep colors during a transform 1
 <!-- /wp:paragraph -->"
 `;
 
-exports[`Keep styles on block transforms Should keep the font size during a transform from multiple blocks into a single one 1`] = `
-"<!-- wp:list {\\"fontSize\\":\\"large\\"} -->
-<ul class=\\"has-large-font-size\\"><li>Line 1 to be made large</li><li>Line 2 to be made large</li><li>Line 3 to be made large</li></ul>
-<!-- /wp:list -->"
-`;
-
 exports[`Keep styles on block transforms Should keep the font size during a transform from multiple blocks into multiple blocks 1`] = `
 "<!-- wp:heading {\\"fontSize\\":\\"large\\"} -->
 <h2 class=\\"has-large-font-size\\">Line 1 to be made large</h2>

package/specs/editor/various/__snapshots__/multi-block-selection.test.js.snap

@@ -152,7 +152,9 @@ exports[`Multi-block selection should multi-select from within the list block 1`
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><li>1</li></ul>
+<ul><!-- wp:list-item -->
+<li>1</li>
+<!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
 `;
 
@@ -248,6 +250,28 @@ exports[`Multi-block selection should preserve dragged selection on move 1`] = `
 <!-- /wp:paragraph -->"
 `;
 
+exports[`Multi-block selection should properly select multiple blocks if selected nested blocks belong to different parent 1`] = `
+"<!-- wp:group {\\"layout\\":{\\"type\\":\\"constrained\\"}} -->
+<div class=\\"wp-block-group\\"><!-- wp:paragraph -->
+<p>first</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
+<p>group</p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {\\"layout\\":{\\"type\\":\\"constrained\\"}} -->
+<div class=\\"wp-block-group\\"><!-- wp:paragraph -->
+<p>second</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
+<p>group</p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:group -->"
+`;
+
 exports[`Multi-block selection should return original focus after failed multi selection attempt 1`] = `
 "<!-- wp:paragraph -->
 <p>2</p>

package/specs/editor/various/__snapshots__/rich-text.test.js.snap

@@ -102,12 +102,24 @@ exports[`RichText should only mutate text data on input 1`] = `
 
 exports[`RichText should paste list contents into paragraph 1`] = `
 "<!-- wp:list -->
-<ul><li>1<ul><li>2</li></ul></li></ul>
+<ul><!-- wp:list-item -->
+<li>1<!-- wp:list -->
+<ul><!-- wp:list-item -->
+<li>2</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list --></li>
+<!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
-<!-- wp:paragraph -->
-<p>1<br>2</p>
-<!-- /wp:paragraph -->"
+<!-- wp:list -->
+<ul><!-- wp:list-item -->
+<li>1<!-- wp:list -->
+<ul><!-- wp:list-item -->
+<li>2</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list --></li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->"
 `;
 
 exports[`RichText should paste paragraph contents into list 1`] = `
@@ -116,7 +128,9 @@ exports[`RichText should paste paragraph contents into list 1`] = `
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><li>1</li><li>2</li></ul>
+<ul><!-- wp:list-item -->
+<li>1<br>2</li>
+<!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
 `;
 

package/specs/editor/various/block-switcher.test.js

@@ -18,6 +18,8 @@ describe( 'Block Switcher', () => {
 		// Insert a list block.
 		await insertBlock( 'List' );
 		await page.keyboard.type( 'List content' );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'ArrowUp' );
 		await pressKeyWithModifier( 'alt', 'F10' );
 
 		// Verify the block switcher exists.
@@ -31,7 +33,6 @@ describe( 'Block Switcher', () => {
 				'Heading',
 				'Quote',
 				'Columns',
-				'Table of Contents',
 			] )
 		);
 	} );
@@ -45,6 +46,8 @@ describe( 'Block Switcher', () => {
 		// Insert a list block.
 		await insertBlock( 'List' );
 		await page.keyboard.type( 'List content' );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'ArrowUp' );
 		await pressKeyWithModifier( 'alt', 'F10' );
 
 		// Verify the block switcher exists.
@@ -56,7 +59,7 @@ describe( 'Block Switcher', () => {
 				'Group',
 				'Paragraph',
 				'Heading',
-				'Table of Contents',
+				'Columns',
 			] )
 		);
 	} );
@@ -71,13 +74,14 @@ describe( 'Block Switcher', () => {
 				'core/group',
 				'core/heading',
 				'core/columns',
-				'core/table-of-contents',
 			].map( ( block ) => wp.blocks.unregisterBlockType( block ) );
 		} );
 
 		// Insert a list block.
 		await insertBlock( 'List' );
 		await page.keyboard.type( 'List content' );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'ArrowUp' );
 		await pressKeyWithModifier( 'alt', 'F10' );
 
 		// Verify the block switcher exists.
@@ -91,6 +95,8 @@ describe( 'Block Switcher', () => {
 			it( 'Should show Columns block only if selected blocks are between limits (1-6)', async () => {
 				await insertBlock( 'List' );
 				await page.keyboard.type( 'List content' );
+				await page.keyboard.press( 'ArrowUp' );
+				await page.keyboard.press( 'ArrowUp' );
 				await insertBlock( 'Heading' );
 				await page.keyboard.type( 'I am a header' );
 				await page.keyboard.down( 'Shift' );
@@ -103,6 +109,8 @@ describe( 'Block Switcher', () => {
 			it( 'Should NOT show Columns transform only if selected blocks are more than max limit(6)', async () => {
 				await insertBlock( 'List' );
 				await page.keyboard.type( 'List content' );
+				await page.keyboard.press( 'ArrowUp' );
+				await page.keyboard.press( 'ArrowUp' );
 				await insertBlock( 'Heading' );
 				await page.keyboard.type( 'I am a header' );
 				await page.keyboard.press( 'Enter' );

package/specs/editor/various/font-size-picker.test.js

@@ -37,9 +37,7 @@ const toggleCustomInput = async ( showCustomInput ) => {
 };
 
 const clickCustomInput = async () => {
-	const customInput = await page.waitForXPath(
-		"//input[@aria-label='Custom']"
-	);
+	const customInput = await page.waitForXPath( "//input[@type='number']" );
 	return customInput.click();
 };
 

package/specs/editor/various/inserting-blocks.test.js

@@ -279,6 +279,8 @@ describe( 'Inserting blocks', () => {
 		await insertBlock( 'Group' );
 		await insertBlock( 'Paragraph' );
 		await page.keyboard.type( 'Paragraph after group' );
+		// Click the Group first to make the appender inside it clickable.
+		await page.click( '[data-type="core/group"]' );
 		await page.click( '[data-type="core/group"] [aria-label="Add block"]' );
 		const browseAll = await page.waitForXPath(
 			'//button[text()="Browse all"]'
@@ -295,6 +297,8 @@ describe( 'Inserting blocks', () => {
 		await insertBlock( 'Group' );
 		await insertBlock( 'Paragraph' );
 		await page.keyboard.type( 'Text' );
+		// Click the Group first to make the appender inside it clickable.
+		await page.click( '[data-type="core/group"]' );
 		await page.click( '[data-type="core/group"] [aria-label="Add block"]' );
 		await page.waitForSelector( INSERTER_SEARCH_SELECTOR );
 		await page.focus( INSERTER_SEARCH_SELECTOR );

package/specs/editor/various/keep-styles-on-block-transforms.test.js

@@ -34,23 +34,6 @@ describe( 'Keep styles on block transforms', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
-	it( 'Should keep the font size during a transform from multiple blocks into a single one', async () => {
-		// Create a paragraph block with some content.
-		await clickBlockAppender();
-		await page.keyboard.type( 'Line 1 to be made large' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Line 2 to be made large' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Line 3 to be made large' );
-		await pressKeyWithModifier( 'shift', 'ArrowUp' );
-		await pressKeyWithModifier( 'shift', 'ArrowUp' );
-		await page.click(
-			'[role="radiogroup"][aria-label="Font size"] [aria-label="Large"]'
-		);
-		await transformBlockTo( 'List' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
 	it( 'Should keep the font size during a transform from multiple blocks into multiple blocks', async () => {
 		// Create a paragraph block with some content.
 		await clickBlockAppender();

package/specs/editor/various/multi-block-selection.test.js

@@ -331,6 +331,9 @@ describe( 'Multi-block selection', () => {
 		await page.keyboard.up( 'Shift' );
 		await transformBlockTo( 'Group' );
 
+		// Confirm setup.
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+
 		// Click the first paragraph in the first Group block while pressing `shift` key.
 		const firstParagraph = await page.waitForXPath( "//p[text()='first']" );
 		await page.keyboard.down( 'Shift' );
@@ -676,6 +679,10 @@ describe( 'Multi-block selection', () => {
 
 		await pressKeyWithModifier( 'primary', 'a' );
 
+		await page.waitForSelector( '[data-type="core/column"].is-selected' );
+
+		await pressKeyWithModifier( 'primary', 'a' );
+
 		await page.waitForSelector(
 			'[data-type="core/column"].is-multi-selected'
 		);
@@ -699,6 +706,7 @@ describe( 'Multi-block selection', () => {
 		// Confirm correct setup: a paragraph and a list.
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 
+		await pressKeyWithModifier( 'primary', 'a' );
 		await pressKeyWithModifier( 'primary', 'a' );
 		await pressKeyWithModifier( 'primary', 'a' );
 

package/specs/editor/various/rich-text.test.js

@@ -473,15 +473,18 @@ describe( 'RichText', () => {
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.type( ' 2' );
 
-		// Select all and copy.
+		// Select all text.
+		await pressKeyWithModifier( 'primary', 'a' );
+		// Select the nested list.
+		await pressKeyWithModifier( 'primary', 'a' );
+		// Select the parent list item.
+		await pressKeyWithModifier( 'primary', 'a' );
+		// Select all the parent list item text.
+		await pressKeyWithModifier( 'primary', 'a' );
+		// Select the entire list.
 		await pressKeyWithModifier( 'primary', 'a' );
 		await pressKeyWithModifier( 'primary', 'c' );
 
-		// Collapse the selection to the end.
-		await page.keyboard.press( 'ArrowRight' );
-
-		// Create a paragraph.
-		await page.keyboard.press( 'Enter' );
 		await page.keyboard.press( 'Enter' );
 
 		// Paste paragraph contents.

package/specs/editor/various/splitting-merging.test.js

@@ -235,7 +235,7 @@ describe( 'splitting and merging blocks', () => {
 			await page.keyboard.type( 'item 1' );
 			await page.keyboard.press( 'Enter' );
 			await page.keyboard.type( 'item 2' );
-			await pressKeyTimes( 'ArrowUp', 2 );
+			await pressKeyTimes( 'ArrowUp', 5 );
 			await page.keyboard.press( 'Delete' );
 			// Carret should be in the first block and at the proper position.
 			await page.keyboard.type( '-' );
@@ -257,13 +257,18 @@ describe( 'splitting and merging blocks', () => {
 			await page.keyboard.press( 'Enter' );
 			await page.keyboard.type( 'item 2' );
 			await page.keyboard.press( 'ArrowUp' );
+			await page.keyboard.press( 'ArrowUp' );
 			await pressKeyTimes( 'ArrowLeft', 6 );
 			await page.keyboard.press( 'Backspace' );
 			// Carret should be in the first block and at the proper position.
 			await page.keyboard.type( '-' );
 			expect( await getEditedPostContent() ).toMatchInlineSnapshot( `
 			"<!-- wp:paragraph -->
-			<p>hi-item 1</p>
+			<p>hi</p>
+			<!-- /wp:paragraph -->
+
+			<!-- wp:paragraph -->
+			<p>-item 1</p>
 			<!-- /wp:paragraph -->
 
 			<!-- wp:paragraph -->

package/specs/editor/various/toolbar-roving-tabindex.test.js

@@ -86,7 +86,8 @@ describe( 'Toolbar roving tabindex', () => {
 	it( 'ensures list block toolbar uses roving tabindex', async () => {
 		await insertBlock( 'List' );
 		await page.keyboard.type( 'List' );
-		await testBlockToolbarKeyboardNavigation( 'Block: List', 'List' );
+		await testBlockToolbarKeyboardNavigation( 'List text', 'Select List' );
+		await page.click( `[aria-label="Select List"]` );
 		await wrapCurrentBlockWithGroup( 'List' );
 		await testGroupKeyboardNavigation( 'Block: List', 'List' );
 	} );

package/specs/editor/plugins/register-block-type-hooks.test.js

@@ -1,32 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	activatePlugin,
-	createNewPost,
-	deactivatePlugin,
-	openGlobalBlockInserter,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'Register block type hooks', () => {
-	beforeEach( async () => {
-		await activatePlugin( 'gutenberg-test-register-block-type-hooks' );
-		await createNewPost();
-	} );
-
-	afterEach( async () => {
-		await deactivatePlugin( 'gutenberg-test-register-block-type-hooks' );
-	} );
-
-	it( 'has a custom category for Paragraph block', async () => {
-		await openGlobalBlockInserter();
-
-		const widgetsCategory = await page.waitForSelector(
-			'.block-editor-block-types-list[aria-label="Widgets"]'
-		);
-
-		expect(
-			await widgetsCategory.$( '.editor-block-list-item-paragraph' )
-		).toBeDefined();
-	} );
-} );