@wordpress/e2e-tests 4.9.1 → 5.0.1-next.957ca95e4c.0

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

@@ -154,7 +154,7 @@ async function updateActiveNavigationLink( { url, label, type } ) {
 		);
 		await input.type( url );
 
-		const suggestionPath = `//button[contains(@class, 'block-editor-link-control__search-item') and contains(@class, '${ typeClasses[ type ] }')]/span/span[@class='block-editor-link-control__search-item-title']/mark[text()="${ url }"]`;
+		const suggestionPath = `//button[contains(@class, 'block-editor-link-control__search-item') and contains(@class, '${ typeClasses[ type ] }') and contains(., "${ url }")]`;
 
 		// Wait for the autocomplete suggestion item to appear.
 		await page.waitForXPath( suggestionPath );
@@ -186,12 +186,13 @@ async function updateActiveNavigationLink( { url, label, type } ) {
 }
 
 async function selectClassicMenu( optionText ) {
-	const dropdown = await page.waitForXPath(
-		"//*[contains(@class, 'wp-block-navigation-placeholder__actions__dropdown')]"
+	const navigationSelector = await page.waitForXPath(
+		"//button[text()='Select Menu']"
 	);
-	await dropdown.click();
+	await navigationSelector.click();
+
 	const theOption = await page.waitForXPath(
-		`//*[contains(@class, 'components-menu-item__item')][ text()="${ optionText }" ]`
+		'//button[contains(., "' + optionText + '")]'
 	);
 	await theOption.click();
 
@@ -201,24 +202,6 @@ async function selectClassicMenu( optionText ) {
 	);
 }
 
-async function populateNavWithOneItem() {
-	// Add a Link block first.
-	const appender = await page.waitForSelector(
-		'.wp-block-navigation .block-list-appender'
-	);
-	await appender.click();
-	// Add a link to the Link block.
-	await updateActiveNavigationLink( {
-		url: 'https://wordpress.org',
-		label: 'WP',
-		type: 'url',
-	} );
-}
-
-const PLACEHOLDER_ACTIONS_CLASS = 'wp-block-navigation-placeholder__actions';
-const PLACEHOLDER_ACTIONS_XPATH = `//*[contains(@class, '${ PLACEHOLDER_ACTIONS_CLASS }')]`;
-const START_EMPTY_XPATH = `${ PLACEHOLDER_ACTIONS_XPATH }//button[text()='Start empty']`;
-
 /**
  * Delete all items for the given REST resources using the REST API.
  *
@@ -246,17 +229,6 @@ async function deleteAll( endpoints ) {
 	}
 }
 
-async function resetNavBlockToInitialState() {
-	const selectMenuDropdown = await page.waitForSelector(
-		'[aria-label="Select Menu"]'
-	);
-	await selectMenuDropdown.click();
-	const newMenuButton = await page.waitForXPath(
-		'//span[text()="Create new menu"]'
-	);
-	newMenuButton.click();
-}
-
 /**
  * Replace unique ids in nav block content, since these won't be consistent
  * between test runs.
@@ -306,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;
 
@@ -355,7 +328,8 @@ describe( 'Navigation', () => {
 			// Insert an empty block to trigger resolution of Nav Menu items.
 			await insertBlock( 'Navigation' );
 			await waitForBlock( 'Navigation' );
-			await page.waitForXPath( START_EMPTY_XPATH );
+
+			await page.waitForXPath( "//button[text()='Select Menu']" );
 
 			// Now we have Nav Menu items resolved. Continue to assert.
 			await clickOnMoreMenuItem( 'Code editor' );
@@ -475,15 +449,18 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			await createNewPost();
 			await insertBlock( 'Navigation' );
 
-			let navBlock = await waitForBlock( 'Navigation' );
+			const navBlock = await waitForBlock( 'Navigation' );
 
 			// Create empty Navigation block with no items
-			const startEmptyButton = await page.waitForXPath(
-				START_EMPTY_XPATH
+			const navigationSelector = await page.waitForXPath(
+				"//button[text()='Select Menu']"
 			);
-			await startEmptyButton.click();
+			await navigationSelector.click();
 
-			navBlock = await waitForBlock( 'Navigation' );
+			const createNewMenuButton = await page.waitForXPath(
+				'//button[contains(., "Create new menu")]'
+			);
+			await createNewMenuButton.click();
 
 			// Check for the spinner to be present whilst loading.
 			await navBlock.waitForSelector( '.components-spinner' );
@@ -496,48 +473,26 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 	} );
 
 	describe( 'Placeholder', () => {
-		describe( 'placeholder states', () => {
-			it( 'shows placeholder on insertion of block', async () => {
+		describe( 'fallback states', () => {
+			it( 'shows page list on insertion of block', async () => {
 				await createNewPost();
 				await insertBlock( 'Navigation' );
-				await page.waitForXPath( START_EMPTY_XPATH );
+				await waitForBlock( 'Page List' );
 			} );
 
-			it( 'shows placeholder preview when unconfigured block is not selected', async () => {
+			it( 'shows placeholder preview when block with no menu items is not selected', async () => {
 				await createNewPost();
 				await insertBlock( 'Navigation' );
 
-				// Check for unconfigured Placeholder state to display
-				await page.waitForXPath( START_EMPTY_XPATH );
-
-				// Deselect the Nav block by inserting a new block at the root level
-				// outside of the Nav block.
-				await insertBlock( 'Paragraph' );
-
-				const navBlock = await waitForBlock( 'Navigation' );
-
-				// Check Placeholder Preview is visible.
-				await navBlock.waitForSelector(
-					'.wp-block-navigation-placeholder__preview',
-					{ visible: true }
+				const navigationSelector = await page.waitForXPath(
+					"//button[text()='Select Menu']"
 				);
+				await navigationSelector.click();
 
-				// Check Placeholder Component itself is not visible.
-				await navBlock.waitForSelector(
-					'.wp-block-navigation-placeholder__controls',
-					{ visible: false }
-				);
-			} );
-
-			it( 'shows placeholder preview when block with no menu items is not selected', async () => {
-				await createNewPost();
-				await insertBlock( 'Navigation' );
-
-				// Create empty Navigation block with no items
-				const startEmptyButton = await page.waitForXPath(
-					START_EMPTY_XPATH
+				const createNewMenuButton = await page.waitForXPath(
+					'//button[contains(., "Create new menu")]'
 				);
-				await startEmptyButton.click();
+				await createNewMenuButton.click();
 
 				// Wait for Navigation creation to complete.
 				await page.waitForXPath(
@@ -569,7 +524,7 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			} );
 		} );
 
-		describe( 'placeholder actions', () => {
+		describe( 'menu selector actions', () => {
 			it( 'allows a navigation block to be created from existing menus', async () => {
 				await createClassicMenu( { name: 'Test Menu 1' } );
 				await createClassicMenu(
@@ -594,6 +549,8 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 				await insertBlock( 'Navigation' );
 				await selectClassicMenu( 'Test Menu 1' );
 
+				await page.waitForNetworkIdle();
+
 				// Wait for the appender so that we know the navigation menu was created.
 				await page.waitForSelector(
 					'nav[aria-label="Block: Navigation"] button[aria-label="Add block"]'
@@ -605,14 +562,24 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 				await createNewPost();
 
 				await insertBlock( 'Navigation' );
-				await page.waitForXPath( START_EMPTY_XPATH );
+
+				const navigationSelector = await page.waitForXPath(
+					"//button[text()='Select Menu']"
+				);
+				await navigationSelector.click();
+
+				await page.waitForXPath(
+					'//button[contains(., "Create new menu")]'
+				);
+
+				await page.waitForSelector( '.components-menu-group' );
 
 				const placeholderActionsLength = await page.$$eval(
-					`.${ PLACEHOLDER_ACTIONS_CLASS } button`,
+					'.components-menu-group',
 					( els ) => els.length
 				);
 
-				// Should only be showing "Start empty".
+				// Should only be showing "Create new menu".
 				expect( placeholderActionsLength ).toEqual( 1 );
 			} );
 		} );
@@ -621,8 +588,20 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 	it( 'allows an empty navigation block to be created and manually populated using a mixture of internal and external links', async () => {
 		await createNewPost();
 		await insertBlock( 'Navigation' );
-		const startEmptyButton = await page.waitForXPath( START_EMPTY_XPATH );
-		await startEmptyButton.click();
+
+		await showBlockToolbar();
+
+		const navigationSelector = await page.waitForXPath(
+			"//button[text()='Select Menu']"
+		);
+		await navigationSelector.click();
+
+		const createNewMenuButton = await page.waitForXPath(
+			'//button[contains(., "Create new menu")]'
+		);
+		await createNewMenuButton.click();
+
+		await page.waitForNetworkIdle();
 
 		// Await "success" notice.
 		await page.waitForXPath(
@@ -630,7 +609,7 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 		);
 
 		const appender = await page.waitForSelector(
-			'.wp-block-navigation .block-list-appender'
+			'.wp-block-navigation .block-editor-button-block-appender'
 		);
 		await appender.click();
 
@@ -696,11 +675,25 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 	it( 'encodes URL when create block if needed', async () => {
 		await createNewPost();
 		await insertBlock( 'Navigation' );
-		const startEmptyButton = await page.waitForXPath( START_EMPTY_XPATH );
-		await startEmptyButton.click();
+		const navigationSelector = await page.waitForXPath(
+			"//button[text()='Select Menu']"
+		);
+		await navigationSelector.click();
+
+		const createNewMenuButton = await page.waitForXPath(
+			'//button[contains(., "Create new menu")]'
+		);
+		await createNewMenuButton.click();
+
+		await page.waitForNetworkIdle();
+
+		// Await "success" notice.
+		await page.waitForXPath(
+			'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+		);
 
 		const appender = await page.waitForSelector(
-			'.wp-block-navigation .block-list-appender'
+			'.wp-block-navigation .block-editor-button-block-appender'
 		);
 		await appender.click();
 
@@ -762,10 +755,26 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 	it( 'allows pages to be created from the navigation block and their links added to menu', async () => {
 		await createNewPost();
 		await insertBlock( 'Navigation' );
-		const startEmptyButton = await page.waitForXPath( START_EMPTY_XPATH );
-		await startEmptyButton.click();
+
+		const navigationSelector = await page.waitForXPath(
+			"//button[text()='Select Menu']"
+		);
+		await navigationSelector.click();
+
+		const createNewMenuButton = await page.waitForXPath(
+			'//button[contains(., "Create new menu")]'
+		);
+		await createNewMenuButton.click();
+
+		await page.waitForNetworkIdle();
+
+		// Await "success" notice.
+		await page.waitForXPath(
+			'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+		);
+
 		const appender = await page.waitForSelector(
-			'.wp-block-navigation .block-list-appender'
+			'.wp-block-navigation .block-editor-button-block-appender'
 		);
 		await appender.click();
 
@@ -811,10 +820,26 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 	it( 'correctly decodes special characters in the created Page title for display', async () => {
 		await createNewPost();
 		await insertBlock( 'Navigation' );
-		const startEmptyButton = await page.waitForXPath( START_EMPTY_XPATH );
-		await startEmptyButton.click();
+
+		const navigationSelector = await page.waitForXPath(
+			"//button[text()='Select Menu']"
+		);
+		await navigationSelector.click();
+
+		const createNewMenuButton = await page.waitForXPath(
+			'//button[contains(., "Create new menu")]'
+		);
+		await createNewMenuButton.click();
+
+		await page.waitForNetworkIdle();
+
+		// Await "success" notice.
+		await page.waitForXPath(
+			'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+		);
+
 		const appender = await page.waitForSelector(
-			'.wp-block-navigation .block-list-appender'
+			'.wp-block-navigation .block-editor-button-block-appender'
 		);
 		await appender.click();
 
@@ -904,11 +929,26 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 	it( 'Shows the quick inserter when the block contains non-navigation specific blocks', async () => {
 		await createNewPost();
 		await insertBlock( 'Navigation' );
-		const startEmptyButton = await page.waitForXPath( START_EMPTY_XPATH );
-		await startEmptyButton.click();
+
+		const navigationSelector = await page.waitForXPath(
+			"//button[text()='Select Menu']"
+		);
+		await navigationSelector.click();
+
+		const createNewMenuButton = await page.waitForXPath(
+			'//button[contains(., "Create new menu")]'
+		);
+		await createNewMenuButton.click();
+
+		await page.waitForNetworkIdle();
+
+		// Await "success" notice.
+		await page.waitForXPath(
+			'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+		);
 
 		const appender = await page.waitForSelector(
-			'.wp-block-navigation .block-list-appender'
+			'.wp-block-navigation .block-editor-button-block-appender'
 		);
 		await appender.click();
 
@@ -949,13 +989,27 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 
 			const navBlock = await waitForBlock( 'Navigation' );
 
-			// Create empty Navigation block with no items
-			const startEmptyButton = await page.waitForXPath(
-				START_EMPTY_XPATH
+			const navigationSelector = await page.waitForXPath(
+				"//button[text()='Select Menu']"
 			);
-			await startEmptyButton.click();
+			await navigationSelector.click();
 
-			await populateNavWithOneItem();
+			const createNewMenuButton = await page.waitForXPath(
+				'//button[contains(., "Create new menu")]'
+			);
+			await createNewMenuButton.click();
+
+			await page.waitForNetworkIdle();
+
+			// Await "success" notice.
+			await page.waitForXPath(
+				'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+			);
+
+			const appender = await page.waitForSelector(
+				'.wp-block-navigation .block-editor-button-block-appender'
+			);
+			await appender.click();
 
 			await clickOnMoreMenuItem( 'Code editor' );
 			const codeEditorInput = await page.waitForSelector(
@@ -1083,11 +1137,27 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			await createNewPost();
 			await insertBlock( 'Navigation' );
 
-			const startEmptyButton = await page.waitForXPath(
-				START_EMPTY_XPATH
+			const navigationSelector = await page.waitForXPath(
+				"//button[text()='Select Menu']"
+			);
+			await navigationSelector.click();
+
+			const createNewMenuButton = await page.waitForXPath(
+				'//button[contains(., "Create new menu")]'
+			);
+			await createNewMenuButton.click();
+
+			await page.waitForNetworkIdle();
+
+			// Await "success" notice.
+			await page.waitForXPath(
+				'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+			);
+
+			const appender = await page.waitForSelector(
+				'.wp-block-navigation .block-editor-button-block-appender'
 			);
-			await startEmptyButton.click();
-			await populateNavWithOneItem();
+			await appender.click();
 
 			// Confirm that the menu entity was updated.
 			const publishPanelButton = await page.waitForSelector(
@@ -1117,13 +1187,27 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			// await page.click( 'nav[aria-label="Block: Navigation"]' );
 			await forceSelectNavigationBlock();
 
-			await resetNavBlockToInitialState();
+			const newNavigationSelector = await page.waitForXPath(
+				"//button[text()='Select Menu']"
+			);
+			await newNavigationSelector.click();
 
-			const startEmptyButton2 = await page.waitForXPath(
-				START_EMPTY_XPATH
+			const newCreateNewMenuButton = await page.waitForXPath(
+				'//button[contains(., "Create new menu")]'
 			);
-			await startEmptyButton2.click();
-			await populateNavWithOneItem();
+			await newCreateNewMenuButton.click();
+
+			await page.waitForNetworkIdle();
+
+			// Await "success" notice.
+			await page.waitForXPath(
+				'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+			);
+
+			const newAppender = await page.waitForSelector(
+				'.wp-block-navigation .block-editor-button-block-appender'
+			);
+			await newAppender.click();
 
 			// Confirm that only the last menu entity was updated.
 			const publishPanelButton2 = await page.waitForSelector(
@@ -1139,11 +1223,26 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 	it( 'applies accessible label to block element', async () => {
 		await createNewPost();
 		await insertBlock( 'Navigation' );
-		const startEmptyButton = await page.waitForXPath( START_EMPTY_XPATH );
-		await startEmptyButton.click();
+
+		const navigationSelector = await page.waitForXPath(
+			"//button[text()='Select Menu']"
+		);
+		await navigationSelector.click();
+
+		const createNewMenuButton = await page.waitForXPath(
+			'//button[contains(., "Create new menu")]'
+		);
+		await createNewMenuButton.click();
+
+		await page.waitForNetworkIdle();
+
+		// Await "success" notice.
+		await page.waitForXPath(
+			'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+		);
 
 		const appender = await page.waitForSelector(
-			'.wp-block-navigation .block-list-appender'
+			'.wp-block-navigation .block-editor-button-block-appender'
 		);
 		await appender.click();
 
@@ -1189,8 +1288,43 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 	it( 'loads the frontend script only once even when multiple navigation blocks are present', async () => {
 		await createNewPost();
 		await insertBlock( 'Navigation' );
+
+		const navigationSelector = await page.waitForXPath(
+			"//button[text()='Select Menu']"
+		);
+		await navigationSelector.click();
+
+		const createNewMenuButton = await page.waitForXPath(
+			'//button[contains(., "Create new menu")]'
+		);
+		await createNewMenuButton.click();
+
+		await page.waitForNetworkIdle();
+
+		// Await "success" notice.
+		await page.waitForXPath(
+			'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+		);
+
 		await insertBlock( 'Navigation' );
 
+		const newNavigationSelector = await page.waitForXPath(
+			"//button[text()='Select Menu']"
+		);
+		await newNavigationSelector.click();
+
+		const newCreateNewMenuButton = await page.waitForXPath(
+			'//button[contains(., "Create new menu")]'
+		);
+		await newCreateNewMenuButton.click();
+
+		await page.waitForNetworkIdle();
+
+		// Await "success" notice.
+		await page.waitForXPath(
+			'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+		);
+
 		const previewPage = await openPreviewPage();
 		await previewPage.bringToFront();
 		await previewPage.waitForNetworkIdle();
@@ -1212,13 +1346,27 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			await createNewPost();
 			await insertBlock( 'Navigation' );
 
-			const startEmptyButton = await page.waitForXPath(
-				START_EMPTY_XPATH
+			const navigationSelector = await page.waitForXPath(
+				"//button[text()='Select Menu']"
 			);
+			await navigationSelector.click();
 
-			await startEmptyButton.click();
+			const createNewMenuButton = await page.waitForXPath(
+				'//button[contains(., "Create new menu")]'
+			);
+			await createNewMenuButton.click();
 
-			await populateNavWithOneItem();
+			await page.waitForNetworkIdle();
+
+			// Await "success" notice.
+			await page.waitForXPath(
+				'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+			);
+
+			const appender = await page.waitForSelector(
+				'.wp-block-navigation .block-editor-button-block-appender'
+			);
+			await appender.click();
 
 			await clickBlockToolbarButton( 'Add submenu' );
 
@@ -1237,24 +1385,44 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			await createNewPost();
 			await insertBlock( 'Navigation' );
 
-			const startEmptyButton = await page.waitForXPath(
-				START_EMPTY_XPATH
+			const navigationSelector = await page.waitForXPath(
+				"//button[text()='Select Menu']"
+			);
+			await navigationSelector.click();
+
+			const createNewMenuButton = await page.waitForXPath(
+				'//button[contains(., "Create new menu")]'
 			);
+			await createNewMenuButton.click();
 
-			await startEmptyButton.click();
+			await page.waitForNetworkIdle();
 
-			await populateNavWithOneItem();
+			// Await "success" notice.
+			await page.waitForXPath(
+				'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+			);
+
+			const appender = await page.waitForSelector(
+				'.wp-block-navigation .block-editor-button-block-appender'
+			);
+			await appender.click();
+
+			await updateActiveNavigationLink( {
+				url: 'https://make.wordpress.org/core/',
+				label: 'Menu item #1',
+				type: 'url',
+			} );
 
 			await clickBlockToolbarButton( 'Add submenu' );
 
 			await waitForBlock( 'Submenu' );
 
 			// Add a Link block first.
-			const appender = await page.waitForSelector(
+			const SubAppender = await page.waitForSelector(
 				'[aria-label="Block: Submenu"] [aria-label="Add block"]'
 			);
 
-			await appender.click();
+			await SubAppender.click();
 
 			await updateActiveNavigationLink( {
 				url: 'https://make.wordpress.org/core/',
@@ -1265,11 +1433,12 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			await clickBlockToolbarButton( 'Select Submenu' );
 
 			// Check button exists but is in disabled state.
-			const disabledConvertToLinkButton = await page.$(
-				'[aria-label="Block tools"] [aria-label="Convert to Link"][disabled]'
+			const disabledConvertToLinkButton = await page.$$eval(
+				'[aria-label="Block tools"] [aria-label="Convert to Link"][disabled]',
+				( els ) => els.length
 			);
 
-			expect( disabledConvertToLinkButton ).toBeTruthy();
+			expect( disabledConvertToLinkButton ).toEqual( 1 );
 		} );
 
 		it( 'shows button to convert submenu to link when submenu is populated with a single incomplete link item', async () => {
@@ -1279,24 +1448,41 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			await createNewPost();
 			await insertBlock( 'Navigation' );
 
-			const startEmptyButton = await page.waitForXPath(
-				START_EMPTY_XPATH
+			await clickBlockToolbarButton( 'Select Menu' );
+
+			const createNewMenuButton = await page.waitForXPath(
+				'//button[contains(., "Create new menu")]'
 			);
+			await createNewMenuButton.click();
 
-			await startEmptyButton.click();
+			await page.waitForNetworkIdle();
 
-			await populateNavWithOneItem();
+			// Await "success" notice.
+			await page.waitForXPath(
+				'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
+			);
+
+			const appender = await page.waitForSelector(
+				'.wp-block-navigation .block-editor-button-block-appender'
+			);
+			await appender.click();
+
+			await updateActiveNavigationLink( {
+				url: 'https://make.wordpress.org/core/',
+				label: 'Menu item #1',
+				type: 'url',
+			} );
 
 			await clickBlockToolbarButton( 'Add submenu' );
 
 			await waitForBlock( 'Submenu' );
 
 			// Add a Link block first.
-			const appender = await page.waitForSelector(
+			const subAppender = await page.waitForSelector(
 				'[aria-label="Block: Submenu"] [aria-label="Add block"]'
 			);
 
-			await appender.click();
+			await subAppender.click();
 
 			// Here we intentionally do not populate the inserted Navigation Link block.
 			// Rather we immediaely click away leaving the link in a state where it has
@@ -1393,7 +1579,52 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			expect( linkText ).toBe( 'WordPress' );
 		} );
 
-		it( 'does not automatically use first Navigation Menu if more than one exists', async () => {
+		it( 'does not automatically use the first Navigation Menu if uncontrolled inner blocks are present', async () => {
+			const pageTitle = 'A Test Page';
+
+			await createNavigationMenu( {
+				title: 'Example Navigation',
+				content:
+					'<!-- wp:navigation-link {"label":"First Nav Menu Item","type":"custom","url":"http://www.wordpress.org/","kind":"custom","isTopLevelLink":true} /-->',
+			} );
+
+			await rest( {
+				method: 'POST',
+				path: `/wp/v2/pages/`,
+				data: {
+					status: 'publish',
+					title: pageTitle,
+					content: 'Hello world',
+				},
+			} );
+
+			await createNewPost();
+
+			await clickOnMoreMenuItem( 'Code editor' );
+
+			const codeEditorInput = await page.waitForSelector(
+				'.editor-post-text-editor'
+			);
+			await codeEditorInput.click();
+
+			const markup =
+				'<!-- wp:navigation --><!-- wp:page-list /--><!-- /wp:navigation -->';
+			await page.keyboard.type( markup );
+			await clickButton( 'Exit code editor' );
+
+			await waitForBlock( 'Navigation' );
+
+			const hasUncontrolledInnerBlocks = await page.evaluate( () => {
+				const blocks = wp.data
+					.select( 'core/block-editor' )
+					.getBlocks();
+				return !! blocks[ 0 ]?.innerBlocks?.length;
+			} );
+
+			expect( hasUncontrolledInnerBlocks ).toBe( true );
+		} );
+
+		it( 'automatically uses most recent Navigation Menu if more than one exists', async () => {
 			await createNavigationMenu( {
 				title: 'Example Navigation',
 				content:
@@ -1412,7 +1643,14 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 
 			await waitForBlock( 'Navigation' );
 
-			await page.waitForXPath( START_EMPTY_XPATH );
+			const navigationSelector = await page.waitForXPath(
+				"//button[text()='Select Menu']"
+			);
+			await navigationSelector.click();
+
+			await page.waitForXPath(
+				'//button[@aria-checked="true"][contains(., "Second Example Navigation")]'
+			);
 		} );
 
 		it( 'allows users to manually create new empty menu when block has automatically selected the first available Navigation Menu', async () => {
@@ -1426,35 +1664,35 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 
 			await insertBlock( 'Navigation' );
 
-			await waitForBlock( 'Navigation' );
-
-			await waitForBlock( 'Custom Link' );
-
-			// Reset the nav block to create a new entity.
-			await resetNavBlockToInitialState();
+			const navigationSelector = await page.waitForXPath(
+				"//button[text()='Select Menu']"
+			);
+			await navigationSelector.click();
 
-			const startEmptyButton = await page.waitForXPath(
-				START_EMPTY_XPATH
+			const createNewMenuButton = await page.waitForXPath(
+				'//button[contains(., "Create new menu")]'
 			);
-			await startEmptyButton.click();
+			await createNewMenuButton.click();
+
+			await page.waitForNetworkIdle();
 
-			// Wait for Navigation creation of empty Navigation to complete.
+			// Await "success" notice.
 			await page.waitForXPath(
-				'//*[contains(@class, "components-snackbar")]/*[text()="Navigation Menu successfully created."]'
+				'//div[@class="components-snackbar__content"][contains(text(), "Navigation Menu successfully created.")]'
 			);
 		} );
 
 		it( 'should always focus select menu button after item selection', async () => {
 			// Create some navigation menus to work with.
 			await createNavigationMenu( {
-				title: 'Example Navigation',
+				title: 'First navigation',
 				content:
-					'<!-- wp:navigation-link {"label":"WordPress","type":"custom","url":"http://www.wordpress.org/","kind":"custom","isTopLevelLink":true} /-->',
+					'<!-- wp:navigation-link {"label":"WordPress Example Navigation","type":"custom","url":"http://www.wordpress.org/","kind":"custom","isTopLevelLink":true} /-->',
 			} );
 			await createNavigationMenu( {
-				title: 'Second Example Navigation',
+				title: 'Second Navigation',
 				content:
-					'<!-- wp:navigation-link {"label":"WordPress","type":"custom","url":"http://www.wordpress.org/","kind":"custom","isTopLevelLink":true} /-->',
+					'<!-- wp:navigation-link {"label":"WordPress Second Example Navigation","type":"custom","url":"http://www.wordpress.org/","kind":"custom","isTopLevelLink":true} /-->',
 			} );
 
 			// Create new post.
@@ -1463,22 +1701,22 @@ Expected mock function not to be called but it was called with: ["POST", "http:/
 			// Insert new block and wait for the insert to complete.
 			await insertBlock( 'Navigation' );
 			await waitForBlock( 'Navigation' );
-			await page.waitForXPath( START_EMPTY_XPATH );
 
-			// Change menus via the select menu toolbar button.
-			const selectMenuDropdown = await page.waitForSelector(
-				'[aria-label="Select Menu"]'
+			const navigationSelector = await page.waitForXPath(
+				"//button[text()='Select Menu']"
 			);
-			await selectMenuDropdown.click();
-			const exampleNavigationOption = await page.waitForXPath(
-				'//span[contains(text(), "Second Example Navigation")]'
+			await navigationSelector.click();
+
+			const theOption = await page.waitForXPath(
+				"//button[@aria-checked='false'][contains(., 'First navigation')]"
 			);
-			await exampleNavigationOption.click();
+			await theOption.click();
 
 			// Once the options are closed, does select menu button receive focus?
-			const selectMenuDropdown2 = await page.waitForSelector(
+			const selectMenuDropdown2 = await page.$(
 				'[aria-label="Select Menu"]'
 			);
+
 			await expect( selectMenuDropdown2 ).toHaveFocus();
 		} );
 	} );