@wordpress/e2e-tests 7.12.1-next.5a1d1283.0 → 7.13.0

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.13.0 (2023-09-20)
+
 ## 7.12.0 (2023-08-31)
 
 ## 7.11.0 (2023-08-16)

package/mu-plugins/enable-templates-ui.php

@@ -12,7 +12,7 @@
  */
 add_filter(
 	'register_post_type_args',
-	static function( $args, $name ) {
+	static function ( $args, $name ) {
 		if ( in_array( $name, array( 'wp_template', 'wp_template_part' ), true ) ) {
 			$args['show_ui'] = wp_is_block_theme();
 		}

package/mu-plugins/nocache-headers.php

@@ -12,7 +12,7 @@
 // for 'networkidle'.
 add_filter(
 	'nocache_headers',
-	static function( $headers ) {
+	static function ( $headers ) {
 		$cache_control_parts      = explode( ', ', $headers['Cache-Control'] );
 		$cache_control_parts      = array_diff( $cache_control_parts, array( 'no-store' ) );
 		$headers['Cache-Control'] = implode( ', ', $cache_control_parts );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "7.12.1-next.5a1d1283.0",
+	"version": "7.13.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": "^10.12.1-next.5a1d1283.0",
-		"@wordpress/jest-console": "^7.13.1-next.5a1d1283.0",
-		"@wordpress/jest-puppeteer-axe": "^6.12.1-next.5a1d1283.0",
-		"@wordpress/scripts": "^26.13.1-next.5a1d1283.0",
-		"@wordpress/url": "^3.42.1-next.5a1d1283.0",
+		"@wordpress/e2e-test-utils": "^10.13.0",
+		"@wordpress/jest-console": "^7.13.0",
+		"@wordpress/jest-puppeteer-axe": "^6.13.0",
+		"@wordpress/scripts": "^26.13.0",
+		"@wordpress/url": "^3.43.0",
 		"chalk": "^4.0.0",
 		"expect-puppeteer": "^4.4.0",
 		"filenamify": "^4.2.0",
@@ -45,5 +45,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "fa0b66987dab5a15f38663e06036d09bccffaa4b"
+	"gitHead": "cc35f517ed017ab7131319af3e87c359e8de175d"
 }

package/plugins/block-context.php

@@ -47,7 +47,7 @@ function gutenberg_test_register_context_blocks() {
 				'postId',
 				'postType',
 			),
-			'render_callback'       => static function( $attributes, $content, $block ) {
+			'render_callback'       => static function ( $attributes, $content, $block ) {
 				$ordered_context = array(
 					$block->context['gutenberg/recordId'],
 					$block->context['postId'],

package/plugins/iframed-block.php

@@ -9,14 +9,14 @@
 
 add_action(
 	'setup_theme',
-	static function() {
+	static function () {
 		add_theme_support( 'block-templates' );
 	}
 );
 
 add_action(
 	'init',
-	static function() {
+	static function () {
 		wp_register_script(
 			'iframed-block-jquery-test',
 			plugin_dir_url( __FILE__ ) . 'iframed-block/jquery.test.js',

package/plugins/iframed-enqueue-block-assets.php

@@ -9,7 +9,7 @@
 
 add_action(
 	'enqueue_block_assets',
-	static function() {
+	static function () {
 		wp_enqueue_style(
 			'iframed-enqueue-block-assets',
 			plugin_dir_url( __FILE__ ) . 'iframed-enqueue-block-assets/style.css',

package/plugins/iframed-enqueue-block-editor-settings.php

@@ -9,7 +9,7 @@
 
 add_action(
 	'block_editor_settings_all',
-	function( $settings ) {
+	function ( $settings ) {
 		$settings['styles'][] = array(
 			'css'            => 'p { border: 1px solid red }',
 			'__unstableType' => 'plugin',

package/plugins/iframed-inline-styles.php

@@ -9,14 +9,14 @@
 
 add_action(
 	'setup_theme',
-	static function() {
+	static function () {
 		add_theme_support( 'block-templates' );
 	}
 );
 
 add_action(
 	'init',
-	static function() {
+	static function () {
 		wp_register_script(
 			'iframed-inline-styles-editor-script',
 			plugin_dir_url( __FILE__ ) . 'iframed-inline-styles/editor.js',
@@ -40,7 +40,7 @@ add_action(
 
 add_action(
 	'enqueue_block_editor_assets',
-	static function() {
+	static function () {
 		wp_enqueue_style(
 			'iframed-inline-styles-compat-style',
 			plugin_dir_url( __FILE__ ) . 'iframed-inline-styles/compat-style.css',

package/plugins/iframed-masonry-block.php

@@ -9,14 +9,14 @@
 
 add_action(
 	'setup_theme',
-	static function() {
+	static function () {
 		add_theme_support( 'block-templates' );
 	}
 );
 
 add_action(
 	'init',
-	static function() {
+	static function () {
 		wp_register_script(
 			'iframed-masonry-block-editor',
 			plugin_dir_url( __FILE__ ) . 'iframed-masonry-block/editor.js',

package/plugins/iframed-multiple-stylesheets.php

@@ -9,14 +9,14 @@
 
 add_action(
 	'setup_theme',
-	static function() {
+	static function () {
 		add_theme_support( 'block-templates' );
 	}
 );
 
 add_action(
 	'init',
-	static function() {
+	static function () {
 		wp_register_script(
 			'iframed-multiple-stylesheets-editor-script',
 			plugin_dir_url( __FILE__ ) . 'iframed-multiple-stylesheets/editor.js',

package/plugins/inner-blocks-allowed-blocks/index.js

@@ -2,14 +2,15 @@
 	const { useSelect } = wp.data;
 	const { registerBlockType } = wp.blocks;
 	const { createElement: el } = wp.element;
-	const { InnerBlocks } = wp.blockEditor;
+	const { InnerBlocks, useBlockProps } = wp.blockEditor;
 	const divProps = {
 		className: 'product',
 		style: { outline: '1px solid gray', padding: 5 },
 	};
 
 	const allowedBlocksWhenSingleEmptyChild = [ 'core/image', 'core/list' ];
-	const allowedBlocksWhenMultipleChildren = [ 'core/gallery', 'core/video' ];
+	const allowedBlocksWhenTwoChildren = [ 'core/gallery', 'core/video' ];
+	const allowedBlocksWhenTreeOrMoreChildren = [ 'core/gallery', 'core/video', 'core/list'  ];
 
 	registerBlockType( 'test/allowed-blocks-dynamic', {
 		apiVersion: 3,
@@ -25,18 +26,23 @@
 				},
 				[ props.clientId ]
 			);
+			const blockProps = useBlockProps({
+				...divProps,
+				'data-number-of-children': numberOfChildren,
+			});
+
+			let allowedBlocks = allowedBlocksWhenSingleEmptyChild;
+			if ( numberOfChildren === 2 ) {
+				allowedBlocks = allowedBlocksWhenTwoChildren;
+			} else if( numberOfChildren > 2 ){
+				allowedBlocks = allowedBlocksWhenTreeOrMoreChildren;
+			}
 
 			return el(
 				'div',
-				{
-					...divProps,
-					'data-number-of-children': numberOfChildren,
-				},
+				blockProps,
 				el( InnerBlocks, {
-					allowedBlocks:
-						numberOfChildren < 2
-							? allowedBlocksWhenSingleEmptyChild
-							: allowedBlocksWhenMultipleChildren,
+					allowedBlocks
 				} )
 			);
 		},

package/plugins/interactive-blocks/router-navigate/block.json

@@ -0,0 +1,14 @@
+{
+	"apiVersion": 2,
+	"name": "test/router-navigate",
+	"title": "E2E Interactivity tests - router navigate",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScript": "router-navigate-view",
+	"render": "file:./render.php"
+}

package/plugins/interactive-blocks/router-navigate/render.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * HTML for testing the router navigate function.
+ *
+ * @package gutenberg-test-interactive-blocks
+ * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+ */
+
+?>
+
+
+<div data-wp-interactive data-wp-navigation-id="region-1">
+	<h2 data-testid="title"><?php echo $attributes['title']; ?></h2>
+
+	<output
+		data-testid="router navigations"
+		data-wp-text="state.router.navigations"
+	>NaN</output>
+	<output
+		data-testid="router status"
+		data-wp-text="state.router.status"
+	>undefined</output>
+
+	<button
+		data-wp-on--click="actions.router.toggleTimeout"
+		data-testid="toggle timeout"
+	>
+		Timeout <span data-wp-text="state.router.timeout">NaN</span>
+	</button>
+
+	<?php
+	if ( isset( $attributes['links'] ) ) {
+		foreach ( $attributes['links'] as $key => $link ) {
+			$i = $key += 1;
+			echo <<<HTML
+			<a
+				data-testid="link $i"
+				data-wp-on--click="actions.router.navigate"
+				href="$link"
+			>link $i</a>
+			<a
+				data-testid="link $i with hash"
+				data-wp-on--click="actions.router.navigate"
+				data-force-navigation="true"
+				href="$link#link-$i-with-hash"
+			>link $i with hash</a>
+HTML;
+		}
+	}
+	?>
+</div>

package/plugins/interactive-blocks/router-navigate/view.js

@@ -0,0 +1,41 @@
+( ( { wp } ) => {
+	/**
+	 * WordPress dependencies
+	 */
+	const { store, navigate } = wp.interactivity;
+
+	store( {
+		state: {
+			router: {
+				status: 'idle',
+				navigations: 0,
+				timeout: 10000,
+			}
+		},
+		actions: {
+			router: {
+				navigate: async ( { state, event: e } ) => {
+					e.preventDefault();
+
+					state.router.navigations += 1;
+					state.router.status = 'busy';
+
+					const force = e.target.dataset.forceNavigation === 'true';
+					const { timeout } = state.router;
+
+					await navigate( e.target.href, { force, timeout } );
+
+					state.router.navigations -= 1;
+
+					if ( state.router.navigations === 0) {
+						state.router.status = 'idle';
+					}
+				},
+				toggleTimeout: ( { state }) => {
+					state.router.timeout =
+						state.router.timeout === 10000 ? 0 : 10000;
+				}
+			},
+		},
+	} );
+} )( window );

package/plugins/interactive-blocks.php

@@ -9,7 +9,7 @@
 
 add_action(
 	'init',
-	function() {
+	function () {
 		// Register all blocks found in the `interactive-blocks` folder.
 		if ( file_exists( __DIR__ . '/interactive-blocks/' ) ) {
 			$block_json_files = glob( __DIR__ . '/interactive-blocks/**/block.json' );
@@ -30,8 +30,8 @@ add_action(
 				);
 
 				register_block_type_from_metadata( $block_folder );
-			};
-		};
+			}
+		}
 
 		// Temporary fix to disable SSR of directives during E2E testing. This
 		// is required at this moment, as SSR for directives is not stabilized
@@ -43,6 +43,5 @@ add_action(
 				'gutenberg_interactivity_process_directives_in_root_blocks'
 			);
 		}
-
 	}
 );

package/plugins/marquee-function-widget.php

@@ -14,7 +14,7 @@ function marquee_greeting_init() {
 	wp_register_sidebar_widget(
 		'marquee_greeting',
 		'Marquee Greeting',
-		static function() {
+		static function () {
 			$greeting = get_option( 'marquee_greeting', 'Hello!' );
 			printf( '<marquee>%s</marquee>', esc_html( $greeting ) );
 		}
@@ -23,7 +23,7 @@ function marquee_greeting_init() {
 	wp_register_widget_control(
 		'marquee_greeting',
 		'Marquee Greeting',
-		static function() {
+		static function () {
 			if ( isset( $_POST['marquee-greeting'] ) ) {
 				update_option(
 					'marquee_greeting',

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 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 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 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" aria-controls="my-sidebar-plugin:title-sidebar" 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 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" aria-controls="my-sidebar-plugin:title-sidebar" 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 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 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" aria-controls="my-sidebar-plugin:title-sidebar" 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 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" aria-controls="my-sidebar-plugin:title-sidebar" 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/annotations.test.js

@@ -29,13 +29,6 @@ describe( 'Annotations', () => {
 
 	beforeEach( async () => {
 		await createNewPost();
-		// To do: run with iframe.
-		await page.evaluate( () => {
-			window.wp.blocks.registerBlockType( 'test/v2', {
-				apiVersion: '2',
-				title: 'test',
-			} );
-		} );
 	} );
 
 	/**
@@ -57,7 +50,7 @@ describe( 'Annotations', () => {
 		// Click add annotation button.
 		const addAnnotationButton = (
 			await page.$x( "//button[contains(text(), 'Add annotation')]" )
-		 )[ 0 ];
+		)[ 0 ];
 		await addAnnotationButton.click();
 		await canvas().evaluate( () =>
 			document.querySelector( '.wp-block-paragraph' ).focus()
@@ -73,7 +66,7 @@ describe( 'Annotations', () => {
 		// Click remove annotations button.
 		const addAnnotationButton = (
 			await page.$x( "//button[contains(text(), 'Remove annotations')]" )
-		 )[ 0 ];
+		)[ 0 ];
 		await addAnnotationButton.click();
 		await canvas().evaluate( () =>
 			document.querySelector( '[contenteditable]' ).focus()
@@ -100,7 +93,7 @@ describe( 'Annotations', () => {
 	 */
 	async function getRichTextInnerHTML() {
 		const htmlContent = await canvas().$$( '.wp-block-paragraph' );
-		return await page.evaluate( ( el ) => {
+		return await canvas().evaluate( ( el ) => {
 			return el.innerHTML;
 		}, htmlContent[ 0 ] );
 	}
@@ -126,7 +119,7 @@ describe( 'Annotations', () => {
 		const htmlContent = await canvas().$$(
 			'.block-editor-block-list__block-html-textarea'
 		);
-		const html = await page.evaluate( ( el ) => {
+		const html = await canvas().evaluate( ( el ) => {
 			return el.innerHTML;
 		}, htmlContent[ 0 ] );
 
@@ -145,7 +138,7 @@ describe( 'Annotations', () => {
 
 		await removeAnnotations();
 		const htmlContent = await canvas().$$( '.wp-block-paragraph' );
-		const html = await page.evaluate( ( el ) => {
+		const html = await canvas().evaluate( ( el ) => {
 			return el.innerHTML;
 		}, htmlContent[ 0 ] );
 

package/specs/editor/plugins/container-blocks.test.js

@@ -121,7 +121,7 @@ describe( 'Container block without paragraph support', () => {
 		// Insert an image block.
 		const insertButton = (
 			await page.$x( `//button//span[contains(text(), 'Image')]` )
-		 )[ 0 ];
+		)[ 0 ];
 		await insertButton.click();
 
 		// Check the inserted content.

package/specs/editor/plugins/custom-taxonomies.test.js

@@ -32,7 +32,7 @@ describe( 'Custom Taxonomies labels are used', () => {
 		// Get the classes from the panel.
 		const buttonClassName = await (
 			await openButton.getProperty( 'className' )
-		 ).jsonValue();
+		).jsonValue();
 
 		// Open the panel if needed.
 		if ( -1 === buttonClassName.indexOf( 'is-opened' ) ) {

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

@@ -58,7 +58,7 @@ describe( 'RenderAppender prop of InnerBlocks', () => {
 		const inserterPopover = await page.$( INSERTER_RESULTS_SELECTOR );
 		const quoteButton = (
 			await inserterPopover.$x( QUOTE_INSERT_BUTTON_SELECTOR )
-		 )[ 0 ];
+		)[ 0 ];
 
 		// Insert a quote block.
 		await quoteButton.click();
@@ -93,7 +93,7 @@ describe( 'RenderAppender prop of InnerBlocks', () => {
 		const inserterPopover = await page.$( INSERTER_RESULTS_SELECTOR );
 		const quoteButton = (
 			await inserterPopover.$x( QUOTE_INSERT_BUTTON_SELECTOR )
-		 )[ 0 ];
+		)[ 0 ];
 
 		// Insert a quote block.
 		await quoteButton.click();

package/specs/editor/plugins/meta-boxes.test.js

@@ -103,9 +103,8 @@ describe( 'Meta boxes', () => {
 
 		// Open the excerpt panel.
 		await openDocumentSettingsSidebar();
-		const excerptButton = await findSidebarPanelToggleButtonWithTitle(
-			'Excerpt'
-		);
+		const excerptButton =
+			await findSidebarPanelToggleButtonWithTitle( 'Excerpt' );
 		if ( excerptButton ) {
 			await excerptButton.click( 'button' );
 		}

package/specs/editor/various/__snapshots__/{reusable-blocks.test.js.snap → pattern-blocks.test.js.snap}

@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Reusable blocks allows conversion back to blocks when the reusable block has unsaved edits 1`] = `
+exports[`Pattern blocks allows conversion back to blocks when the reusable block has unsaved edits 1`] = `
 "<!-- wp:paragraph -->
 <p>12</p>
 <!-- /wp:paragraph -->"
 `;
 
-exports[`Reusable blocks can be created from multiselection and converted back to regular blocks 1`] = `
+exports[`Pattern blocks can be created from multiselection and converted back to regular blocks 1`] = `
 "<!-- wp:paragraph -->
 <p>Hello there!</p>
 <!-- /wp:paragraph -->

package/specs/editor/various/change-detection.test.js

@@ -102,7 +102,7 @@ describe( 'Change detection', () => {
 
 		const postPendingReviewButton = (
 			await page.$x( "//label[contains(text(), 'Pending review')]" )
-		 )[ 0 ];
+		)[ 0 ];
 		await postPendingReviewButton.click( 'button' );
 
 		// Force autosave to occur immediately.

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

@@ -259,7 +259,7 @@ describe( 'Inserting blocks', () => {
 
 		const headingButton = (
 			await page.$x( `//button//span[contains(text(), 'Heading')]` )
-		 )[ 0 ];
+		)[ 0 ];
 		// Hover over the block should show the blue line indicator.
 		await headingButton.hover();
 
@@ -354,7 +354,7 @@ describe( 'Inserting blocks', () => {
 		await openGlobalBlockInserter();
 		const paragraphButton = (
 			await page.$x( `//button//span[contains(text(), 'Paragraph')]` )
-		 )[ 0 ];
+		)[ 0 ];
 		await paragraphButton.hover();
 		const preview = await page.waitForSelector(
 			'.block-editor-inserter__preview',

package/specs/editor/various/{reusable-blocks.test.js → pattern-blocks.test.js}

@@ -4,7 +4,7 @@
 import {
 	clickMenuItem,
 	insertBlock,
-	insertReusableBlock,
+	insertPattern,
 	createNewPost,
 	clickBlockToolbarButton,
 	pressKeyWithModifier,
@@ -19,9 +19,9 @@ import {
 	canvas,
 } from '@wordpress/e2e-test-utils';
 
-const reusableBlockNameInputSelector =
+const patternBlockNameInputSelector =
 	'.patterns-menu-items__convert-modal .components-text-control__input';
-const reusableBlockInspectorNameInputSelector =
+const patternBlockInspectorNameInputSelector =
 	'.block-editor-block-inspector .components-text-control__input';
 const syncToggleSelectorChecked =
 	'.patterns-menu-items__convert-modal .components-form-toggle.is-checked';
@@ -60,7 +60,7 @@ const clearAllBlocks = async () => {
 	} );
 };
 
-describe( 'Reusable blocks', () => {
+describe( 'Pattern blocks', () => {
 	afterAll( async () => {
 		await trashAllPosts( 'wp_block' );
 	} );
@@ -74,12 +74,12 @@ describe( 'Reusable blocks', () => {
 		await clearAllBlocks();
 
 		// Insert the reusable block we created above.
-		await insertReusableBlock( 'Greeting block' );
+		await insertPattern( 'Greeting block' );
 
 		// Change the block's title.
 		await openDocumentSettingsSidebar();
 		const nameInput = await page.waitForSelector(
-			reusableBlockInspectorNameInputSelector
+			patternBlockInspectorNameInputSelector
 		);
 		await nameInput.click();
 		await pressKeyWithModifier( 'primary', 'a' );
@@ -108,7 +108,7 @@ describe( 'Reusable blocks', () => {
 		await clearAllBlocks();
 
 		// Insert the reusable block we edited above.
-		await insertReusableBlock( 'Surprised greeting block' );
+		await insertPattern( 'Surprised greeting block' );
 
 		// Convert block to a regular block.
 		await clickBlockToolbarButton( 'Options' );
@@ -170,12 +170,12 @@ describe( 'Reusable blocks', () => {
 		await createNewPost();
 
 		// Step 3. Insert the block created in Step 1.
-		await insertReusableBlock( 'Awesome block' );
+		await insertPattern( 'Awesome block' );
 
 		// Check the title.
 		await openDocumentSettingsSidebar();
 		const title = await page.$eval(
-			reusableBlockInspectorNameInputSelector,
+			patternBlockInspectorNameInputSelector,
 			( element ) => element.value
 		);
 		expect( title ).toBe( 'Awesome block' );
@@ -200,7 +200,7 @@ describe( 'Reusable blocks', () => {
 
 		// Set title.
 		const nameInput = await page.waitForSelector(
-			reusableBlockNameInputSelector
+			patternBlockNameInputSelector
 		);
 		await nameInput.click();
 		await page.keyboard.type( 'Multi-selection reusable block' );
@@ -215,7 +215,7 @@ describe( 'Reusable blocks', () => {
 		await clearAllBlocks();
 
 		// Insert the reusable block we edited above.
-		await insertReusableBlock( 'Multi-selection reusable block' );
+		await insertPattern( 'Multi-selection reusable block' );
 
 		// Convert block to a regular block.
 		await clickBlockToolbarButton( 'Options' );
@@ -231,7 +231,7 @@ describe( 'Reusable blocks', () => {
 			'Random reusable block'
 		);
 		await clearAllBlocks();
-		await insertReusableBlock( 'Random reusable block' );
+		await insertPattern( 'Random reusable block' );
 
 		await visitAdminPage( 'edit.php', [ 'post_type=wp_block' ] );
 
@@ -298,8 +298,8 @@ describe( 'Reusable blocks', () => {
 			'Duplicated reusable block'
 		);
 		await clearAllBlocks();
-		await insertReusableBlock( 'Duplicated reusable block' );
-		await insertReusableBlock( 'Duplicated reusable block' );
+		await insertPattern( 'Duplicated reusable block' );
+		await insertPattern( 'Duplicated reusable block' );
 		await saveDraft();
 		await page.reload();
 		await page.waitForSelector( 'iframe[name="editor-canvas"]' );
@@ -384,7 +384,7 @@ describe( 'Reusable blocks', () => {
 		await clickBlockToolbarButton( 'Options' );
 		await clickMenuItem( 'Create pattern' );
 		const nameInput = await page.waitForSelector(
-			reusableBlockNameInputSelector
+			patternBlockNameInputSelector
 		);
 		await nameInput.click();
 		await page.keyboard.type( 'Block with styles' );

package/specs/site-editor/multi-entity-saving.test.js

@@ -77,9 +77,8 @@ describe( 'Multi-entity save flow', () => {
 
 		// Reusable assertions inside Post editor.
 		const assertMultiSaveEnabled = async () => {
-			const multiSaveButton = await page.waitForSelector(
-				multiSaveSelector
-			);
+			const multiSaveButton =
+				await page.waitForSelector( multiSaveSelector );
 			expect( multiSaveButton ).not.toBeNull();
 		};
 		const assertMultiSaveDisabled = async () => {

package/specs/widgets/editing-widgets.test.js

@@ -388,9 +388,8 @@ describe( 'Widgets screen', () => {
 				name: 'Block: Widget Area',
 			} );
 			await firstWidgetArea.focus();
-			const marqueeBlock = await getBlockInGlobalInserter(
-				'Marquee Greeting'
-			);
+			const marqueeBlock =
+				await getBlockInGlobalInserter( 'Marquee Greeting' );
 			await marqueeBlock.click();
 			await page.waitForFunction(
 				( expectedMarquees ) => {
@@ -721,9 +720,8 @@ describe( 'Widgets screen', () => {
 		const [ firstWidgetArea, secondWidgetArea ] = widgetAreas;
 
 		// Insert a paragraph it should be in the first widget area.
-		const inserterParagraphBlock = await getBlockInGlobalInserter(
-			'Paragraph'
-		);
+		const inserterParagraphBlock =
+			await getBlockInGlobalInserter( 'Paragraph' );
 		await inserterParagraphBlock.hover();
 		await inserterParagraphBlock.click();
 		const addedParagraphBlockInFirstWidgetArea = await find(

package/specs/performance/post-editor.test.results.json

@@ -1,19 +0,0 @@
-{
-	"serverResponse": [],
-	"firstPaint": [],
-	"domContentLoaded": [],
-	"loaded": [],
-	"firstContentfulPaint": [],
-	"firstBlock": [],
-	"type": [
-		75.483, 96.376, 82.063, 101.192, 87.573, 56.599000000000004,
-		63.778999999999996, 93.079, 98.277, 95.365, 94.48599999999999, 55.739,
-		81.715, 66.875, 60.897, 54.249, 52.537, 58.745, 49.615
-	],
-	"typeContainer": [],
-	"focus": [],
-	"listViewOpen": [],
-	"inserterOpen": [],
-	"inserterHover": [],
-	"inserterSearch": []
-}

package/specs/performance/site-editor.test.results.json

@@ -1,60 +0,0 @@
-{
-	"serverResponse": [
-		409.40000009536743, 405.59999990463257, 410.09999990463257
-	],
-	"firstPaint": [ 438.59999990463257, 447.3999996185303, 449.59999990463257 ],
-	"domContentLoaded": [ 676, 690.0999999046326, 693 ],
-	"loaded": [ 1405.6999998092651, 1400.3999996185303, 1425.9000000953674 ],
-	"firstContentfulPaint": [
-		903.2999997138977, 921.0999999046326, 925.2999997138977
-	],
-	"firstBlock": [
-		3166.7999997138977, 3206.5999999046326, 3238.4000000953674
-	],
-	"type": [
-		81.45900000000002, 37.088, 36.051, 38.596000000000004, 49.931, 40.322,
-		38.99999999999999, 34.235, 33.608999999999995, 32.88399999999999, 30.44,
-		37.113, 31.534999999999997, 33.792, 36.942, 35.251000000000005, 33.722,
-		33.471999999999994, 35.26499999999999, 29.682, 30.173,
-		30.674999999999997, 35.668000000000006, 38.278, 37.62, 37.562, 38.091,
-		32.237, 28.119999999999997, 31.342, 39.89, 37.443, 37.761, 40.262,
-		37.922, 30.727, 30.955000000000002, 36.53000000000001, 32.293, 37.299,
-		38.55800000000001, 39.85699999999999, 33.721999999999994, 30.139,
-		29.294, 31.016, 35.7, 36.839, 31.061000000000003, 29.540000000000003,
-		48.998999999999995, 35.423, 33.650000000000006, 29.404999999999998,
-		32.744, 30.584999999999997, 30.705, 31.873, 28.907, 30.516, 30.882,
-		29.257, 29.794, 31.150000000000002, 32.095, 31.066000000000003, 32.872,
-		31.894, 31.331, 31.796, 31.675, 30.427999999999997, 30.872, 30.974,
-		32.707, 31.849999999999998, 28.935, 28.441000000000003,
-		30.566000000000003, 29.014, 33.158, 32.272, 28.990000000000002, 28.76,
-		28.967000000000002, 29.418, 28.503, 31.255000000000003, 28.703,
-		30.369000000000003, 34.910000000000004, 31.03, 28.523,
-		32.361999999999995, 33.870000000000005, 30.11, 30.944000000000003,
-		28.601, 30.572999999999997, 33.216, 30.822, 28.892000000000003,
-		32.95099999999999, 31.228, 28.251, 34.89, 30.131000000000004, 29.395,
-		31.557000000000002, 28.137, 32.051, 38.242, 36.382999999999996, 35.037,
-		36.2, 31.717999999999996, 28.927999999999997, 32.540000000000006,
-		35.448, 28.292, 35.059999999999995, 31.345000000000002, 36.122, 31.69,
-		28.492, 29.308, 30.793000000000003, 28.784000000000002,
-		28.275999999999996, 36.577999999999996, 30.220000000000002, 35.832,
-		31.192, 36.102999999999994, 30.733999999999998, 30.574,
-		35.455999999999996, 29.963, 37.967, 29.323999999999998, 36.643,
-		31.200000000000003, 36.864999999999995, 32.344, 30.321, 29.214, 28.627,
-		29.71, 29.006, 36.067, 29.583, 29.562, 37.795, 30.166999999999998,
-		30.811999999999998, 33.319, 32.939, 39.233999999999995, 28.856,
-		34.81700000000001, 30.324, 33.611000000000004, 33.707,
-		30.191000000000003, 29.191, 29.23, 30.715, 29.281, 28.168,
-		33.449000000000005, 36.36600000000001, 29.086, 30.589, 29.13, 28.789,
-		29.156000000000002, 43.327, 34.439, 28.777, 30.586, 28.973000000000003,
-		30.026, 40.023, 30.203, 28.328000000000003, 30.825000000000003, 29.739,
-		31.504, 43.708000000000006, 29.296999999999997, 32.294, 31.733, 30.44,
-		28.879, 30.349999999999998, 29.466, 29.302999999999997, 30,
-		29.468999999999998, 28.740000000000002
-	],
-	"typeContainer": [],
-	"focus": [],
-	"inserterOpen": [],
-	"inserterHover": [],
-	"inserterSearch": [],
-	"listViewOpen": []
-}