@wordpress/e2e-tests 7.12.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.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.0",
-		"@wordpress/jest-console": "^7.12.0",
-		"@wordpress/jest-puppeteer-axe": "^6.12.0",
-		"@wordpress/scripts": "^26.12.0",
-		"@wordpress/url": "^3.42.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": "5eac1734bcdca2301fdd37ec8cfe2a45e722a2c4"
+	"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',