@wordpress/e2e-tests 4.7.0 → 4.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "4.7.0",
+	"version": "4.8.0",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -23,11 +23,11 @@
 		"node": ">=12"
 	},
 	"dependencies": {
-		"@wordpress/e2e-test-utils": "^7.9.0",
+		"@wordpress/e2e-test-utils": "^7.10.0",
 		"@wordpress/jest-console": "^5.4.0",
-		"@wordpress/jest-puppeteer-axe": "^4.0.2",
-		"@wordpress/scripts": "^23.5.0",
-		"@wordpress/url": "^3.14.0",
+		"@wordpress/jest-puppeteer-axe": "^4.1.0",
+		"@wordpress/scripts": "^23.6.0",
+		"@wordpress/url": "^3.15.0",
 		"chalk": "^4.0.0",
 		"expect-puppeteer": "^4.4.0",
 		"filenamify": "^4.2.0",
@@ -46,5 +46,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "9d9d33bbdf317a4381b8ca1713e43bb50df653b3"
+	"gitHead": "0315dbc240cb2aa146d7c1bafd251f004b88300e"
 }

package/plugins/cpt-locking.php

@@ -19,7 +19,13 @@ function gutenberg_test_cpt_locking() {
 				'placeholder' => 'Add a description',
 			),
 		),
-		array( 'core/quote' ),
+		array(
+			'core/quote',
+			array(),
+			array(
+				array( 'core/paragraph' ),
+			),
+		),
 		array( 'core/columns' ),
 	);
 	register_post_type(
@@ -65,7 +71,13 @@ function gutenberg_test_cpt_locking() {
 						'templateLock' => false,
 					),
 					array(
-						array( 'core/quote' ),
+						array(
+							'core/quote',
+							array(),
+							array(
+								array( 'core/paragraph' ),
+							),
+						),
 						array(
 							'core/paragraph',
 							array(
@@ -91,7 +103,13 @@ function gutenberg_test_cpt_locking() {
 						'templateLock' => 'all',
 					),
 					array(
-						array( 'core/quote' ),
+						array(
+							'core/quote',
+							array(),
+							array(
+								array( 'core/paragraph' ),
+							),
+						),
 						array(
 							'core/paragraph',
 							array(
@@ -115,7 +133,13 @@ function gutenberg_test_cpt_locking() {
 					'core/group',
 					array(),
 					array(
-						array( 'core/quote' ),
+						array(
+							'core/quote',
+							array(),
+							array(
+								array( 'core/paragraph' ),
+							),
+						),
 						array(
 							'core/paragraph',
 							array(

package/specs/editor/blocks/__snapshots__/quote.test.js.snap

@@ -34,180 +34,86 @@ exports[`Quote can be converted to paragraphs and renders one paragraph block pe
 
 exports[`Quote can be converted to paragraphs and renders only one paragraph for the cite, if the quote is void 1`] = `
 "<!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
 <p>cite</p>
 <!-- /wp:paragraph -->"
 `;
 
 exports[`Quote can be created by converting a heading 1`] = `
 "<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>test</p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:heading -->
+<h2>test</h2>
+<!-- /wp:heading --></blockquote>
 <!-- /wp:quote -->"
 `;
 
 exports[`Quote can be created by converting a paragraph 1`] = `
 "<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>test</p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p>test</p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->"
 `;
 
 exports[`Quote can be created by converting multiple paragraphs 1`] = `
 "<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>one</p><p>two</p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p>one</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
+<p>two</p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->"
 `;
 
 exports[`Quote can be created by typing "/quote" 1`] = `
 "<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>I’m a quote</p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p>I’m a quote</p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->"
 `;
 
 exports[`Quote can be created by typing > in front of text of a paragraph block 1`] = `
 "<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>test</p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p>test</p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->"
 `;
 
 exports[`Quote can be created by using > at the start of a paragraph block 1`] = `
 "<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>A quote</p><p>Another paragraph</p></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Quote can be merged into from a paragraph 1`] = `
-"<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>test</p></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Quote can be split at the end and merged back 1`] = `
-"<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>1</p></blockquote>
-<!-- /wp:quote -->
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p>A quote</p>
+<!-- /wp:paragraph -->
 
 <!-- wp:paragraph -->
-<p></p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Quote can be split at the end and merged back 2`] = `
-"<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>1</p><p></p></blockquote>
+<p>Another paragraph</p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->"
 `;
 
-exports[`Quote can be split at the end and merged back 3`] = `
+exports[`Quote can be split at the end 1`] = `
 "<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>1</p></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Quote can be split in the middle and merged back 1`] = `
-"<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>1</p><cite>c</cite></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p>1</p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:paragraph -->
 <p></p>
-<!-- /wp:paragraph -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>2</p><cite>c</cite></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Quote can be split in the middle and merged back 2`] = `
-"<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>1</p><p></p><cite>c</cite></blockquote>
-<!-- /wp:quote -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>2</p><cite>c</cite></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Quote can be split in the middle and merged back 3`] = `
-"<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>1</p><cite>c</cite></blockquote>
-<!-- /wp:quote -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>2</p><cite>c</cite></blockquote>
-<!-- /wp:quote -->"
+<!-- /wp:paragraph -->"
 `;
 
-exports[`Quote can be split in the middle and merged back 4`] = `
+exports[`Quote can be split at the end 2`] = `
 "<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>1</p><p>2</p><cite>c</cite></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Quote is transformed to a heading and a quote if the quote contains a citation 1`] = `
-"<!-- wp:heading -->
-<h2>one</h2>
-<!-- /wp:heading -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p><cite>cite</cite></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Quote is transformed to a heading and a quote if the quote contains multiple paragraphs 1`] = `
-"<!-- wp:heading -->
-<h2>one</h2>
-<!-- /wp:heading -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>two</p><p>three</p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p>1</p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->"
 `;
-
-exports[`Quote is transformed to a heading if the quote just contains one paragraph 1`] = `
-"<!-- wp:heading -->
-<h2>one</h2>
-<!-- /wp:heading -->"
-`;
-
-exports[`Quote is transformed to an empty heading if the quote is empty 1`] = `
-"<!-- wp:heading -->
-<h2></h2>
-<!-- /wp:heading -->"
-`;
-
-exports[`Quote the resuling quote after transforming to a heading can be transformed again 1`] = `
-"<!-- wp:heading -->
-<h2>one</h2>
-<!-- /wp:heading -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>two</p><cite>cite</cite></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Quote the resuling quote after transforming to a heading can be transformed again 2`] = `
-"<!-- wp:heading -->
-<h2>one</h2>
-<!-- /wp:heading -->
-
-<!-- wp:heading -->
-<h2>two</h2>
-<!-- /wp:heading -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p><cite>cite</cite></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Quote the resuling quote after transforming to a heading can be transformed again 3`] = `
-"<!-- wp:heading -->
-<h2>one</h2>
-<!-- /wp:heading -->
-
-<!-- wp:heading -->
-<h2>two</h2>
-<!-- /wp:heading -->
-
-<!-- wp:heading -->
-<h2>cite</h2>
-<!-- /wp:heading -->"
-`;

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

@@ -1317,9 +1317,10 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			await switchUserToAdmin();
 		} );
 
-		it( 'shows a warning if user does not have permission to create navigation menus', async () => {
+		it.skip( 'shows a warning if user does not have permission to create navigation menus', async () => {
 			const noticeText =
 				'You do not have permission to create Navigation Menus.';
+
 			// Switch to a Contributor role user - they should not have
 			// permission to update Navigations.
 			await loginUser( contributorUsername, contributorPassword );

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

@@ -77,7 +77,9 @@ describe( 'Quote', () => {
 			await page.keyboard.type( 'one' );
 			await page.keyboard.press( 'Enter' );
 			await page.keyboard.type( 'two' );
-			await transformBlockTo( 'Paragraph' );
+			// Navigate to the citation to select the block.
+			await page.keyboard.press( 'ArrowRight' );
+			await transformBlockTo( 'Unwrap' );
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
 		} );
@@ -89,7 +91,7 @@ describe( 'Quote', () => {
 			await page.keyboard.type( 'two' );
 			await page.keyboard.press( 'ArrowRight' );
 			await page.keyboard.type( 'cite' );
-			await transformBlockTo( 'Paragraph' );
+			await transformBlockTo( 'Unwrap' );
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
 		} );
@@ -98,14 +100,15 @@ describe( 'Quote', () => {
 			await insertBlock( 'Quote' );
 			await page.keyboard.press( 'ArrowRight' );
 			await page.keyboard.type( 'cite' );
-			await transformBlockTo( 'Paragraph' );
+			await transformBlockTo( 'Unwrap' );
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
 		} );
 
 		it( 'and renders a void paragraph if both the cite and quote are void', async () => {
 			await insertBlock( 'Quote' );
-			await transformBlockTo( 'Paragraph' );
+			await page.keyboard.press( 'ArrowRight' ); // Select the quote
+			await transformBlockTo( 'Unwrap' );
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
 		} );
@@ -119,56 +122,6 @@ describe( 'Quote', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
-	it( 'is transformed to an empty heading if the quote is empty', async () => {
-		await insertBlock( 'Quote' );
-		await transformBlockTo( 'Heading' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'is transformed to a heading if the quote just contains one paragraph', async () => {
-		await insertBlock( 'Quote' );
-		await page.keyboard.type( 'one' );
-		await transformBlockTo( 'Heading' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'is transformed to a heading and a quote if the quote contains multiple paragraphs', async () => {
-		await insertBlock( 'Quote' );
-		await page.keyboard.type( 'one' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'two' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'three' );
-		await transformBlockTo( 'Heading' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'is transformed to a heading and a quote if the quote contains a citation', async () => {
-		await insertBlock( 'Quote' );
-		await page.keyboard.type( 'one' );
-		await page.keyboard.press( 'ArrowRight' );
-		await page.keyboard.type( 'cite' );
-		await transformBlockTo( 'Heading' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'the resuling quote after transforming to a heading can be transformed again', async () => {
-		await insertBlock( 'Quote' );
-		await page.keyboard.type( 'one' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'two' );
-		await page.keyboard.press( 'ArrowRight' );
-		await page.keyboard.type( 'cite' );
-		await transformBlockTo( 'Heading' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-		await page.click( '[data-type="core/quote"]' );
-		await transformBlockTo( 'Heading' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-		await page.click( '[data-type="core/quote"]' );
-		await transformBlockTo( 'Heading' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
 	it( 'can be converted to a pullquote', async () => {
 		await insertBlock( 'Quote' );
 		await page.keyboard.type( 'one' );
@@ -180,16 +133,7 @@ describe( 'Quote', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
-	it( 'can be merged into from a paragraph', async () => {
-		await insertBlock( 'Quote' );
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'test' );
-		await pressKeyTimes( 'ArrowLeft', 'test'.length );
-		await page.keyboard.press( 'Backspace' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'can be split at the end and merged back', async () => {
+	it( 'can be split at the end', async () => {
 		await insertBlock( 'Quote' );
 		await page.keyboard.type( '1' );
 		await page.keyboard.press( 'Enter' );
@@ -200,46 +144,7 @@ describe( 'Quote', () => {
 
 		await page.keyboard.press( 'Backspace' );
 
-		// Expect empty paragraph inside quote block.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-
-		await page.keyboard.press( 'Backspace' );
-
-		// Expect quote without empty paragraphs.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'can be split in the middle and merged back', async () => {
-		await insertBlock( 'Quote' );
-		await page.keyboard.type( '1' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( '2' );
-		await page.keyboard.press( 'ArrowRight' );
-		await page.keyboard.type( 'c' );
-		await page.keyboard.press( 'ArrowUp' );
-		await page.keyboard.press( 'ArrowUp' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.press( 'Enter' );
-
-		// Expect two quote blocks and empty paragraph in the middle.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-
-		await page.keyboard.press( 'Backspace' );
-
-		// Expect two quote blocks and empty paragraph in the first quote.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-
-		await page.keyboard.press( 'Backspace' );
-
-		// Expect two quote blocks.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-
-		await page.keyboard.press( 'ArrowLeft' );
-		await page.keyboard.press( 'ArrowDown' );
-		await page.keyboard.press( 'ArrowDown' );
-		await page.keyboard.press( 'ArrowDown' );
-		await page.keyboard.press( 'Backspace' );
-
+		// Expect the paragraph to be deleted.
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 } );

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

@@ -10,7 +10,9 @@ exports[`cpt locking template_lock all should insert line breaks when using ente
 <!-- /wp:paragraph -->
 
 <!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:columns -->
@@ -28,7 +30,9 @@ exports[`cpt locking template_lock all should not error when deleting the cotent
 <!-- /wp:paragraph -->
 
 <!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:columns -->
@@ -43,7 +47,9 @@ exports[`cpt locking template_lock all unlocked group should allow blocks to be
 <!-- /wp:paragraph -->
 
 <!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote --></div>
 <!-- /wp:group -->"
 `;
@@ -51,7 +57,9 @@ exports[`cpt locking template_lock all unlocked group should allow blocks to be
 exports[`cpt locking template_lock all unlocked group should allow blocks to be removed 1`] = `
 "<!-- wp:group {\\"templateLock\\":false} -->
 <div class=\\"wp-block-group\\"><!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote --></div>
 <!-- /wp:group -->"
 `;
@@ -66,7 +74,9 @@ exports[`cpt locking template_lock false should allow blocks to be inserted 1`]
 <!-- /wp:paragraph -->
 
 <!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:columns -->
@@ -88,7 +98,9 @@ exports[`cpt locking template_lock false should allow blocks to be moved 1`] = `
 <!-- /wp:image -->
 
 <!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:columns -->
@@ -102,7 +114,9 @@ exports[`cpt locking template_lock false should allow blocks to be removed 1`] =
 <!-- /wp:image -->
 
 <!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:columns -->
@@ -120,7 +134,9 @@ exports[`cpt locking template_lock insert should allow blocks to be moved 1`] =
 <!-- /wp:image -->
 
 <!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:columns -->

package/specs/editor/plugins/__snapshots__/inner-blocks-render-appender.test.js.snap

@@ -3,7 +3,9 @@
 exports[`RenderAppender prop of InnerBlocks Users can customize the appender and can still insert blocks using exposed components 1`] = `
 "<!-- wp:test/inner-blocks-render-appender -->
 <div style=\\"outline:1px solid gray;padding:5px\\" class=\\"wp-block-test-inner-blocks-render-appender\\"><!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote --></div>
 <!-- /wp:test/inner-blocks-render-appender -->"
 `;
@@ -11,7 +13,9 @@ exports[`RenderAppender prop of InnerBlocks Users can customize the appender and
 exports[`RenderAppender prop of InnerBlocks Users can dynamically customize the appender 1`] = `
 "<!-- wp:test/inner-blocks-render-appender-dynamic -->
 <div style=\\"outline:1px solid gray;padding:5px\\" class=\\"wp-block-test-inner-blocks-render-appender-dynamic\\"><!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:video -->

package/specs/editor/plugins/__snapshots__/templates.test.js.snap

@@ -10,7 +10,9 @@ exports[`templates Using a CPT with a predefined template Should add a custom po
 <!-- /wp:paragraph -->
 
 <!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:columns -->
@@ -36,7 +38,9 @@ exports[`templates Using a CPT with a predefined template Should respect user ed
 <!-- /wp:paragraph -->
 
 <!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
+<blockquote class=\\"wp-block-quote\\"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
 <!-- /wp:quote -->
 
 <!-- wp:columns -->

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

@@ -148,6 +148,8 @@ describe( 'Block variations', () => {
 
 		it( 'should show block information when no matching variation is found', async () => {
 			await insertBlock( 'Large Quote' );
+			// Select the quote block.
+			await page.keyboard.press( 'ArrowDown' );
 			const breadcrumb = await getActiveBreadcrumb();
 			expect( breadcrumb ).toEqual( 'Quote' );
 			const navigationItem = await getFirstNavigationItem();

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

@@ -49,12 +49,12 @@ describe( 'cpt locking', () => {
 
 	const shouldAllowBlocksToBeMoved = async () => {
 		await page.click(
-			'.block-editor-rich-text__editable[data-type="core/paragraph"]'
+			'div > .block-editor-rich-text__editable[data-type="core/paragraph"]'
 		);
 		expect( await page.$( 'button[aria-label="Move up"]' ) ).not.toBeNull();
 		await page.click( 'button[aria-label="Move up"]' );
 		await page.type(
-			'.block-editor-rich-text__editable[data-type="core/paragraph"]',
+			'div > .block-editor-rich-text__editable[data-type="core/paragraph"]',
 			'p1'
 		);
 		expect( await getEditedPostContent() ).toMatchSnapshot();
@@ -193,7 +193,7 @@ describe( 'cpt locking', () => {
 
 		it( 'should allow blocks to be removed', async () => {
 			await page.type(
-				'.block-editor-rich-text__editable[data-type="core/paragraph"]',
+				'div > .block-editor-rich-text__editable[data-type="core/paragraph"]',
 				'p1'
 			);
 			await clickBlockToolbarButton( 'Options' );

package/specs/editor/plugins/inner-blocks-render-appender.test.js

@@ -98,6 +98,9 @@ describe( 'RenderAppender prop of InnerBlocks', () => {
 		// Insert a quote block.
 		await quoteButton.click();
 
+		// Select the quote block.
+		await page.keyboard.press( 'ArrowDown' );
+
 		// Verify if the custom block appender text changed as expected.
 		await page.waitForXPath(
 			`//*[contains(@class, "${ DYNAMIC_APPENDER_SELECTOR }")]/span[contains(@class, "single-blocks-appender")][contains(text(), "Single Blocks Appender")]`

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

@@ -146,22 +146,6 @@ exports[`Multi-block selection should handle Enter across blocks 2`] = `
 <!-- /wp:heading -->"
 `;
 
-exports[`Multi-block selection should merge into quote with correct selection 1`] = `
-"<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>1[</p></blockquote>
-<!-- /wp:quote -->
-
-<!-- wp:paragraph -->
-<p>]2</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Multi-block selection should merge into quote with correct selection 2`] = `
-"<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>1</p><p>&amp;2</p></blockquote>
-<!-- /wp:quote -->"
-`;
-
 exports[`Multi-block selection should multi-select from within the list block 1`] = `
 "<!-- wp:paragraph -->
 <p>1</p>

package/specs/editor/various/__snapshots__/writing-flow.test.js.snap

@@ -207,9 +207,9 @@ exports[`Writing Flow should navigate empty paragraphs 1`] = `
 `;
 
 exports[`Writing Flow should not create extra line breaks in multiline value 1`] = `
-"<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p></p></blockquote>
-<!-- /wp:quote -->"
+"<!-- wp:list -->
+<ul><li></li></ul>
+<!-- /wp:list -->"
 `;
 
 exports[`Writing Flow should not delete surrounding space when deleting a selected word 1`] = `

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

@@ -28,9 +28,8 @@ describe( 'Block Switcher', () => {
 			expect.arrayContaining( [
 				'Group',
 				'Paragraph',
-				'Quote',
 				'Heading',
-				'Pullquote',
+				'Quote',
 				'Columns',
 				'Table of Contents',
 			] )
@@ -56,7 +55,6 @@ describe( 'Block Switcher', () => {
 			expect.arrayContaining( [
 				'Group',
 				'Paragraph',
-				'Pullquote',
 				'Heading',
 				'Table of Contents',
 			] )

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

@@ -718,9 +718,8 @@ describe( 'Multi-block selection', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 
 		// Clear the selected block.
-		const paragraph = await page.$( '[data-type="core/paragraph"]' );
-		const box = await paragraph.boundingBox();
-		await page.mouse.click( box.x - 1, box.y );
+		await page.keyboard.press( 'Escape' );
+		await page.keyboard.press( 'Escape' );
 
 		await pressKeyWithModifier( 'primary', 'a' );
 
@@ -906,30 +905,6 @@ describe( 'Multi-block selection', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
-	it( 'should merge into quote with correct selection', async () => {
-		await clickBlockAppender();
-		await page.keyboard.type( '> 1[' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( ']2' );
-		await page.keyboard.press( 'ArrowLeft' );
-		// Select everything between [].
-		await pressKeyWithModifier( 'shift', 'ArrowLeft' );
-		await pressKeyWithModifier( 'shift', 'ArrowLeft' );
-		await pressKeyWithModifier( 'shift', 'ArrowLeft' );
-
-		// Test setup.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-
-		await page.keyboard.press( 'Backspace' );
-
-		// Ensure selection is in the correct place.
-		await page.keyboard.type( '&' );
-
-		// Expect two blocks with "&" in between.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
 	it( 'should select separator (single element block)', async () => {
 		await clickBlockAppender();
 		await page.keyboard.type( '/hr' );

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

@@ -364,6 +364,8 @@ describe( 'Reusable blocks', () => {
 			'.block-editor-block-list__block[aria-label="Block: Quote"]'
 		);
 		await quoteBlock.click();
+		// Select the quote block.
+		await page.keyboard.press( 'ArrowDown' );
 		await openDocumentSettingsSidebar();
 		await page.waitForXPath(
 			'//*[@role="region"][@aria-label="Editor settings"]//button[.="Styles"]'

package/specs/editor/various/writing-flow.test.js

@@ -282,7 +282,7 @@ describe( 'Writing Flow', () => {
 	} );
 
 	it( 'should not create extra line breaks in multiline value', async () => {
-		await insertBlock( 'Quote' );
+		await insertBlock( 'List' );
 		await page.keyboard.type( 'a' );
 		await page.keyboard.press( 'Backspace' );
 		expect( await getEditedPostContent() ).toMatchSnapshot();
@@ -753,4 +753,77 @@ describe( 'Writing Flow', () => {
 		);
 		expect( paragraphs ).toEqual( [ 'first', 'second' ] );
 	} );
+
+	it( 'should move to the start of the first line on ArrowUp', async () => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'a' );
+
+		async function getHeight() {
+			return await page.evaluate(
+				() => document.activeElement.offsetHeight
+			);
+		}
+
+		const height = await getHeight();
+
+		// Keep typing until the height of the element increases. We need two
+		// lines.
+		while ( height === ( await getHeight() ) ) {
+			await page.keyboard.type( 'a' );
+		}
+
+		// Move to the start of the second line.
+		await page.keyboard.press( 'ArrowLeft' );
+		// Move to the start of the first line.
+		await page.keyboard.press( 'ArrowUp' );
+		// Insert a "." for testing.
+		await page.keyboard.type( '.' );
+
+		// Expect the "." to be added at the start of the paragraph.
+		expect(
+			await page.evaluate( () =>
+				document.activeElement.getAttribute( 'data-type' )
+			)
+		).toBe( 'core/paragraph' );
+		expect(
+			await page.evaluate( () => document.activeElement.textContent )
+		).toMatch( /^\.a+$/ );
+	} );
+
+	it( 'should vertically move the caret from corner to corner', async () => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'a' );
+
+		async function getHeight() {
+			return await page.evaluate(
+				() => document.activeElement.offsetHeight
+			);
+		}
+
+		const height = await getHeight();
+
+		// Keep typing until the height of the element increases. We need two
+		// lines.
+		while ( height === ( await getHeight() ) ) {
+			await page.keyboard.type( 'a' );
+		}
+
+		// Create a new paragraph.
+		await page.keyboard.press( 'Enter' );
+		// Move to the start of the first line.
+		await page.keyboard.press( 'ArrowUp' );
+		// Insert a "." for testing.
+		await page.keyboard.type( '.' );
+
+		// Expect the "." to be added at the start of the second line.
+		// It should not be added to the first line!
+		expect(
+			await page.evaluate( () =>
+				document.activeElement.getAttribute( 'data-type' )
+			)
+		).toBe( 'core/paragraph' );
+		expect(
+			await page.evaluate( () => document.activeElement.textContent )
+		).toMatch( /^a+\.a$/ );
+	} );
 } );

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

@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Using Hooks API Pressing reset block button resets the block 1`] = `""`;

package/specs/editor/plugins/hooks-api.test.js

@@ -1,44 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	activatePlugin,
-	clickBlockAppender,
-	createNewPost,
-	deactivatePlugin,
-	getEditedPostContent,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'Using Hooks API', () => {
-	beforeAll( async () => {
-		await activatePlugin( 'gutenberg-test-hooks-api' );
-	} );
-
-	afterAll( async () => {
-		await deactivatePlugin( 'gutenberg-test-hooks-api' );
-	} );
-
-	beforeEach( async () => {
-		await createNewPost();
-	} );
-
-	it( 'Should contain a reset block button on the sidebar', async () => {
-		await clickBlockAppender();
-		await page.keyboard.type( 'First paragraph' );
-		expect(
-			await page.$( '.edit-post-sidebar .e2e-reset-block-button' )
-		).not.toBeNull();
-	} );
-
-	it( 'Pressing reset block button resets the block', async () => {
-		await clickBlockAppender();
-		await page.keyboard.type( 'First paragraph' );
-		const paragraphContent = await page.$eval(
-			'p[data-type="core/paragraph"]',
-			( element ) => element.textContent
-		);
-		expect( paragraphContent ).toEqual( 'First paragraph' );
-		await page.click( '.edit-post-sidebar .e2e-reset-block-button' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-} );