From 0bca60a250d3d42ffc8d0df3788d2e61b53503f0 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Tue, 11 Jul 2023 18:58:01 +0400
Subject: [PATCH] Try fixing block context e2e test failure

---
 packages/e2e-tests/plugins/block-context.php | 22 ++++++++------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/e2e-tests/plugins/block-context.php b/packages/e2e-tests/plugins/block-context.php
index dc92132152e1f0..d245efce2a6156 100644
--- a/packages/e2e-tests/plugins/block-context.php
+++ b/packages/e2e-tests/plugins/block-context.php
@@ -8,10 +8,10 @@
  */
 
 /**
- * Enqueues a custom script for the plugin.
+ * Registers plugin test context blocks.
  */
-function gutenberg_test_enqueue_block_context_script() {
-	wp_enqueue_script(
+function gutenberg_test_register_context_blocks() {
+	wp_register_script(
 		'gutenberg-test-block-context',
 		plugins_url( 'block-context/index.js', __FILE__ ),
 		array(
@@ -22,37 +22,32 @@ function gutenberg_test_enqueue_block_context_script() {
 		filemtime( plugin_dir_path( __FILE__ ) . 'block-context/index.js' ),
 		true
 	);
-}
-add_action( 'init', 'gutenberg_test_enqueue_block_context_script' );
 
-/**
- * Registers plugin test context blocks.
- */
-function gutenberg_test_register_context_blocks() {
 	register_block_type(
 		'gutenberg/test-context-provider',
 		array(
-			'attributes'       => array(
+			'attributes'            => array(
 				'recordId' => array(
 					'type'    => 'number',
 					'default' => 0,
 				),
 			),
-			'provides_context' => array(
+			'provides_context'      => array(
 				'gutenberg/recordId' => 'recordId',
 			),
+			'editor_script_handles' => array( 'gutenberg-test-block-context' ),
 		)
 	);
 
 	register_block_type(
 		'gutenberg/test-context-consumer',
 		array(
-			'uses_context'    => array(
+			'uses_context'          => array(
 				'gutenberg/recordId',
 				'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'],
@@ -61,6 +56,7 @@ function gutenberg_test_register_context_blocks() {
 
 				return implode( ',', $ordered_context );
 			},
+			'editor_script_handles' => array( 'gutenberg-test-block-context' ),
 		)
 	);
 }