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

Timestamp:

05/17/2021 03:06:27 PM (3 years ago)

Author:

gziolo

Message:

Editor: Remove editor type specific filters for block editor configuration

Aligns with changes introduced in the Gutenberg plugin. The planned follow-up replace the editor name string with a context object to bring back an optional reference to the actual post.

Props youknowriad.
See #52920.

File:

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

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

@@ -239 +239 @@
      * @ticket 52920
      */
-    function test_get_block_editor_settings_returns_default_settings() {
-        $this->assertSameSets(
-            get_block_editor_settings( 'my-editor' ),
-            get_default_block_editor_settings()
-        );
-    }
-
-    /**
-     * @ticket 52920
-     */
-    function test_get_block_editor_settings_overrides_default_settings_my_editor() {
+    function test_get_block_editor_settings_overrides_default_settings_all_editors() {
         function filter_allowed_block_types_my_editor() {
             return array( 'test/filtered-my-block' );
         }
+        function filter_block_categories_my_editor() {
+            return array(
+                array(
+                    'slug'  => 'filtered-my-category',
+                    'title' => 'Filtered My Category',
+                    'icon'  => null,
+                ),
+            );
+        }
         function filter_block_editor_settings_my_editor( $editor_settings ) {
             $editor_settings['maxUploadFileSize'] = 12345;
@@ -259 +258 @@
         }
 
-        add_filter( 'allowed_block_types_my-editor', 'filter_allowed_block_types_my_editor', 10, 1 );
-        add_filter( 'block_editor_settings_my-editor', 'filter_block_editor_settings_my_editor', 10, 1 );
+        add_filter( 'allowed_block_types_all', 'filter_allowed_block_types_my_editor', 10, 1 );
+        add_filter( 'block_categories_all', 'filter_block_categories_my_editor', 10, 1 );
+        add_filter( 'block_editor_settings_all', 'filter_block_editor_settings_my_editor', 10, 1 );
 
         $settings = get_block_editor_settings( 'my-editor' );
 
-        remove_filter( 'allowed_block_types_my-editor', 'filter_allowed_block_types_my_editor' );
-        remove_filter( 'block_editor_settings_my-editor', 'filter_block_editor_settings_my_editor' );
+        remove_filter( 'allowed_block_types_all', 'filter_allowed_block_types_my_editor' );
+        remove_filter( 'block_categories_all', 'filter_block_categories_my_editor' );
+        remove_filter( 'block_editor_settings_all', 'filter_block_editor_settings_my_editor' );
 
         $this->assertSameSets( array( 'test/filtered-my-block' ), $settings['allowedBlockTypes'] );
+        $this->assertSameSets(
+            array(
+                array(
+                    'slug'  => 'filtered-my-category',
+                    'title' => 'Filtered My Category',
+                    'icon'  => null,
+                ),
+            ),
+            $settings['blockCategories']
+        );
         $this->assertSame( 12345, $settings['maxUploadFileSize'] );
-    }
-
-    /**
-     * @ticket 52920
-     */
-    function test_get_block_editor_settings_overrides_default_settings_any_editor() {
-        function filter_allowed_block_types_any_editor() {
-            return array( 'test/filtered-any-block' );
-        }
-        function filter_block_categories_any_editor() {
-            return array(
-                array(
-                    'slug'  => 'filtered-any-category',
-                    'title' => 'Filtered Any Category',
-                    'icon'  => null,
-                ),
-            );
-        }
-        function filter_block_editor_settings_any_editor( $editor_settings ) {
-            $editor_settings['maxUploadFileSize'] = 54321;
-
-            return $editor_settings;
-        }
-
-        add_filter( 'allowed_block_types_all', 'filter_allowed_block_types_any_editor', 10, 1 );
-        add_filter( 'block_categories_all', 'filter_block_categories_any_editor', 10, 1 );
-        add_filter( 'block_editor_settings_all', 'filter_block_editor_settings_any_editor', 10, 1 );
-
-        $settings = get_block_editor_settings( 'any-editor' );
-
-        remove_filter( 'allowed_block_types_all', 'filter_allowed_block_types_any_editor' );
-        remove_filter( 'block_categories_all', 'filter_block_categories_any_editor' );
-        remove_filter( 'block_editor_settings_all', 'filter_block_editor_settings_any_editor' );
-
-        $this->assertSameSets( array( 'test/filtered-any-block' ), $settings['allowedBlockTypes'] );
-        $this->assertSameSets(
-            array(
-                array(
-                    'slug'  => 'filtered-any-category',
-                    'title' => 'Filtered Any Category',
-                    'icon'  => null,
-                ),
-            ),
-            $settings['blockCategories']
-        );
-        $this->assertSame( 54321, $settings['maxUploadFileSize'] );
     }