@wordpress/e2e-tests 2.5.8 → 2.5.9

package/jest.config.js

@@ -5,6 +5,7 @@ const baseConfig = require( '@wordpress/scripts/config/jest-e2e.config' );
 
 module.exports = {
 	...baseConfig,
+	testMatch: [ '<rootDir>/specs/**/*.test.js' ],
 	setupFiles: [ '<rootDir>/config/gutenberg-phase.js' ],
 	setupFilesAfterEnv: [
 		'<rootDir>/config/setup-test-framework.js',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "2.5.8",
+	"version": "2.5.9",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -43,5 +43,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "6d3bd917064b4b194677233ee426f5988fa441b9"
+	"gitHead": "49c7be0ff5dc493fc9e5a861e18273dd1f3fce8c"
 }

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

@@ -13,7 +13,7 @@ import {
 
 const getActiveBlockName = async () =>
 	page.evaluate(
-		() => wp.data.select( 'core/block-editor' ).getSelectedBlock().name
+		() => wp.data.select( 'core/block-editor' ).getSelectedBlock()?.name
 	);
 
 const addParagraphsAndColumnsDemo = async () => {
@@ -626,4 +626,24 @@ describe( 'Writing Flow', () => {
 			)
 		).toBe( 'Table' );
 	} );
+
+	it( 'Should unselect all blocks when hitting double escape', async () => {
+		// Add demo content.
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Random Paragraph' );
+
+		// Select a block.
+		let activeBlockName = await getActiveBlockName();
+		expect( activeBlockName ).toBe( 'core/paragraph' );
+
+		// First escape enters navigaiton mode.
+		await page.keyboard.press( 'Escape' );
+		activeBlockName = await getActiveBlockName();
+		expect( activeBlockName ).toBe( 'core/paragraph' );
+
+		// Second escape unselects the blocks.
+		await page.keyboard.press( 'Escape' );
+		activeBlockName = await getActiveBlockName();
+		expect( activeBlockName ).toBe( undefined );
+	} );
 } );

package/specs/experiments/experimental-features.js

@@ -0,0 +1,39 @@
+/**
+ * WordPress dependencies
+ */
+import { addQueryArgs } from '@wordpress/url';
+import { visitAdminPage } from '@wordpress/e2e-test-utils';
+
+async function setExperimentalFeaturesState( features, enable ) {
+	const query = addQueryArgs( '', {
+		page: 'gutenberg-experiments',
+	} );
+	await visitAdminPage( '/admin.php', query );
+
+	await Promise.all(
+		features.map( async ( feature ) => {
+			await page.waitForSelector( feature );
+			const checkedSelector = `${ feature }[checked=checked]`;
+			const isChecked = !! ( await page.$( checkedSelector ) );
+			if ( ( ! isChecked && enable ) || ( isChecked && ! enable ) ) {
+				await page.click( feature );
+			}
+		} )
+	);
+	await Promise.all( [
+		page.waitForNavigation( { waitUntil: 'networkidle0' } ),
+		page.click( '#submit' ),
+	] );
+}
+
+/**
+ * Establishes test lifecycle to enable experimental feature for the duration of
+ * the grouped test block.
+ *
+ * @param {Array} features Array of {string} selectors of settings to enable.
+ *                         Assumes they can be enabled with one click.
+ */
+export function useExperimentalFeatures( features ) {
+	beforeAll( () => setExperimentalFeaturesState( features, true ) );
+	afterAll( () => setExperimentalFeaturesState( features, false ) );
+}

package/specs/experiments/navigation-editor.test.js

@@ -22,7 +22,7 @@ import { addQueryArgs } from '@wordpress/url';
 /**
  * Internal dependencies
  */
-import { useExperimentalFeatures } from '../../experimental-features';
+import { useExperimentalFeatures } from './experimental-features';
 import menuItemsFixture from './fixtures/menu-items-request-fixture.json';
 
 const TYPE_NAMES = {

package/specs/performance/site-editor.test.js

@@ -19,7 +19,7 @@ import {
 /**
  * Internal dependencies
  */
-import { siteEditor } from '../../experimental-features';
+import { siteEditor } from '../site-editor/utils';
 import {
 	readFile,
 	deleteFile,

package/specs/{experiments → site-editor}/document-settings.test.js

@@ -6,7 +6,7 @@ import { trashAllPosts, activateTheme } from '@wordpress/e2e-test-utils';
 /**
  * Internal dependencies
  */
-import { siteEditor } from '../../experimental-features';
+import { siteEditor } from './utils';
 
 async function getDocumentSettingsTitle() {
 	const titleElement = await page.waitForSelector(

package/specs/{experiments → site-editor}/multi-entity-editing.test.js

@@ -16,7 +16,7 @@ import {
 /**
  * Internal dependencies
  */
-import { navigationPanel, siteEditor } from '../../experimental-features';
+import { navigationPanel, siteEditor } from './utils';
 
 const clickTemplateItem = async ( menus, itemName ) => {
 	await navigationPanel.open();

package/specs/{experiments → site-editor}/multi-entity-saving.test.js

@@ -14,7 +14,7 @@ import {
 /**
  * Internal dependencies
  */
-import { siteEditor } from '../../experimental-features';
+import { siteEditor } from './utils';
 
 describe( 'Multi-entity save flow', () => {
 	// Selectors - usable between Post/Site editors.

package/specs/{experiments → site-editor}/settings-sidebar.test.js

@@ -12,7 +12,7 @@ import {
 /**
  * Internal dependencies
  */
-import { siteEditor } from '../../experimental-features';
+import { siteEditor } from './utils';
 
 async function toggleSidebar() {
 	await page.click(

package/specs/{experiments → site-editor}/site-editor-export.test.js

@@ -13,7 +13,7 @@ import { trashAllPosts, activateTheme } from '@wordpress/e2e-test-utils';
 /**
  * Internal dependencies
  */
-import { siteEditor } from '../../experimental-features';
+import { siteEditor } from './utils';
 
 async function waitForFileExists( filePath, timeout = 10000 ) {
 	const start = Date.now();

package/specs/{experiments → site-editor}/site-editor-inserter.test.js

@@ -6,7 +6,7 @@ import { trashAllPosts, activateTheme } from '@wordpress/e2e-test-utils';
 /**
  * Internal dependencies
  */
-import { siteEditor } from '../../experimental-features';
+import { siteEditor } from './utils';
 
 describe( 'Site Editor Inserter', () => {
 	beforeAll( async () => {

package/specs/{experiments → site-editor}/template-part.test.js

@@ -16,7 +16,7 @@ import {
 /**
  * Internal dependencies
  */
-import { siteEditor } from '../../experimental-features';
+import { siteEditor } from './utils';
 
 const templatePartNameInput =
 	'.edit-site-create-template-part-modal .components-text-control__input';

package/specs/{experiments → site-editor}/template-revert.test.js

@@ -14,7 +14,7 @@ import { addQueryArgs } from '@wordpress/url';
 /**
  * Internal dependencies
  */
-import { siteEditor } from '../../experimental-features';
+import { siteEditor } from './utils';
 
 const {
 	visit: visitSiteEditor,

package/{experimental-features.js → specs/site-editor/utils.js}

@@ -4,40 +4,6 @@
 import { addQueryArgs } from '@wordpress/url';
 import { visitAdminPage } from '@wordpress/e2e-test-utils';
 
-async function setExperimentalFeaturesState( features, enable ) {
-	const query = addQueryArgs( '', {
-		page: 'gutenberg-experiments',
-	} );
-	await visitAdminPage( '/admin.php', query );
-
-	await Promise.all(
-		features.map( async ( feature ) => {
-			await page.waitForSelector( feature );
-			const checkedSelector = `${ feature }[checked=checked]`;
-			const isChecked = !! ( await page.$( checkedSelector ) );
-			if ( ( ! isChecked && enable ) || ( isChecked && ! enable ) ) {
-				await page.click( feature );
-			}
-		} )
-	);
-	await Promise.all( [
-		page.waitForNavigation( { waitUntil: 'networkidle0' } ),
-		page.click( '#submit' ),
-	] );
-}
-
-/**
- * Establishes test lifecycle to enable experimental feature for the duration of
- * the grouped test block.
- *
- * @param {Array} features Array of {string} selectors of settings to enable.
- *                         Assumes they can be enabled with one click.
- */
-export function useExperimentalFeatures( features ) {
-	beforeAll( () => setExperimentalFeaturesState( features, true ) );
-	afterAll( () => setExperimentalFeaturesState( features, false ) );
-}
-
 export const navigationPanel = {
 	async open() {
 		const isOpen = !! ( await page.$(