Changeset 50983 for trunk/tests/phpunit/tests/blocks/block-editor.php

Timestamp:

05/24/2021 09:20:31 PM (5 years ago)

Author:

gziolo

Message:

Editor: Use the block editor context in filters that used the editor name

Follow-up for [50956].
Props azaozz, chrisvanpatten, timothyblynjacobs, youknowriad.
Fixes #52920.

File:

• trunk/tests/phpunit/tests/blocks/block-editor.php (modified) (9 diffs)

trunk/tests/phpunit/tests/blocks/block-editor.php

@@ -77 +77 @@
      */
     function test_block_editor_context_post() {
-        $context = new WP_Block_Editor_Context( array( 'post' => $this->post ) );
-
-        $this->assertSame( $this->post, $context->post );
+        $context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+
+        $this->assertSame( get_post(), $context->post );
     }
 
@@ -112 +112 @@
         add_filter( 'block_categories', array( $this, 'filter_set_block_categories_post' ), 10, 2 );
 
-        $block_categories = get_block_categories( 'post-editor' );
+        $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+        $block_categories    = get_block_categories( $post_editor_context );
 
         remove_filter( 'block_categories', array( $this, 'filter_set_block_categories_post' ) );
@@ -132 +133 @@
      */
     function test_get_allowed_block_types_default() {
-        $allowed_block_types = get_allowed_block_types( 'post-editor' );
+        $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+        $allowed_block_types = get_allowed_block_types( $post_editor_context );
 
         $this->assertTrue( $allowed_block_types );
@@ -144 +146 @@
         add_filter( 'allowed_block_types', array( $this, 'filter_set_allowed_block_types_post' ), 10, 2 );
 
-        $allowed_block_types = get_allowed_block_types( 'post-editor' );
+        $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+        $allowed_block_types = get_allowed_block_types( $post_editor_context );
 
         remove_filter( 'allowed_block_types', array( $this, 'filter_set_allowed_block_types_post' ) );
@@ -280 +283 @@
         add_filter( 'block_editor_settings_all', 'filter_block_editor_settings_my_editor', 10, 1 );
 
-        $settings = get_block_editor_settings( 'my-editor' );
+        $my_editor_context = new WP_Block_Editor_Context();
+        $settings          = get_block_editor_settings( array(), $my_editor_context );
 
         remove_filter( 'allowed_block_types_all', 'filter_allowed_block_types_my_editor' );
@@ -307 +311 @@
         add_filter( 'block_editor_settings', array( $this, 'filter_set_block_editor_settings_post' ), 10, 2 );
 
-        $settings = get_block_editor_settings( 'post-editor' );
+        $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+        $settings            = get_block_editor_settings( array(), $post_editor_context );
 
         remove_filter( 'block_editor_settings', array( $this, 'filter_set_block_editor_settings_post' ) );
@@ -323 +328 @@
      */
     function test_block_editor_rest_api_preload_no_paths() {
-        $context = new WP_Block_Editor_Context();
-        block_editor_rest_api_preload( array(), $context );
+        $editor_context = new WP_Block_Editor_Context();
+        block_editor_rest_api_preload( array(), $editor_context );
 
         $after = implode( '', wp_scripts()->registered['wp-api-fetch']->extra['after'] );
@@ -343 +348 @@
         add_filter( 'block_editor_preload_paths', 'filter_remove_preload_paths', 10, 2 );
 
-        $context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+        $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
         block_editor_rest_api_preload(
             array(
                 array( '/wp/v2/blocks', 'OPTIONS' ),
             ),
-            $context
+            $post_editor_context
         );
 
@@ -370 +375 @@
         add_filter( 'block_editor_rest_api_preload_paths', 'filter_add_preload_paths', 10, 2 );
 
-        $context = new WP_Block_Editor_Context();
+        $editor_context = new WP_Block_Editor_Context();
         block_editor_rest_api_preload(
             array(
                 array( '/wp/v2/blocks', 'OPTIONS' ),
             ),
-            $context
+            $editor_context
         );