Changeset 54155 for trunk/tests/phpunit/tests/blocks/register.php

Timestamp:

09/14/2022 10:50:26 AM (2 years ago)

Author:

gziolo

Message:

Blocks: Allow registering multiple items for all supported asset types

Follow-up #54337, [52069]. Part of ​https://github.com/WordPress/gutenberg/issues/41236. More details in ​https://github.com/WordPress/gutenberg/issues/33542.

Allow passing more than one script per block for editorScript, script, and viewScript fields in the block.json metadata file. This aligns with the previously added changes for style and editorStyle fields.

This change impacts the WP_Block_Type class and the REST API endpoint for block types. To ensure backward compatibiliy old names were soft deprecated in favor of new fields that work with array values and have _handles suffix.

Props zieladam, dlh, timothyblynjacobs, aristath, bernhard-reiter.
Fixes #56408.

File:

• trunk/tests/phpunit/tests/blocks/register.php (modified) (8 diffs)

trunk/tests/phpunit/tests/blocks/register.php

@@ -149 +149 @@
         $this->assertSame(
             'unit-tests-my-block-script',
-            generate_block_asset_handle( $block_name, 'script' )
-        );
-        $this->assertSame(
-            'unit-tests-my-block-view-script',
-            generate_block_asset_handle( $block_name, 'viewScript' )
-        );
-        $this->assertSame(
-            'unit-tests-my-block-editor-style',
-            generate_block_asset_handle( $block_name, 'editorStyle' )
+            generate_block_asset_handle( $block_name, 'script', 0 )
+        );
+        $this->assertSame(
+            'unit-tests-my-block-view-script-100',
+            generate_block_asset_handle( $block_name, 'viewScript', 99 )
+        );
+        $this->assertSame(
+            'unit-tests-my-block-editor-style-2',
+            generate_block_asset_handle( $block_name, 'editorStyle', 1 )
         );
         $this->assertSame(
@@ -177 +177 @@
         $this->assertSame(
             'wp-block-paragraph',
-            generate_block_asset_handle( $block_name, 'script' )
-        );
-        $this->assertSame(
-            'wp-block-paragraph-view',
-            generate_block_asset_handle( $block_name, 'viewScript' )
-        );
-        $this->assertSame(
-            'wp-block-paragraph-editor',
-            generate_block_asset_handle( $block_name, 'editorStyle' )
+            generate_block_asset_handle( $block_name, 'script', 0 )
+        );
+        $this->assertSame(
+            'wp-block-paragraph-view-100',
+            generate_block_asset_handle( $block_name, 'viewScript', 99 )
+        );
+        $this->assertSame(
+            'wp-block-paragraph-editor-2',
+            generate_block_asset_handle( $block_name, 'editorStyle', 1 )
         );
         $this->assertSame(
@@ -205 +205 @@
      * @ticket 50263
      */
-    public function test_empty_value_register_block_script_handle() {
+    public function test_empty_string_value_do_not_register_block_script_handle() {
         $metadata = array( 'script' => '' );
         $result   = register_block_script_handle( $metadata, 'script' );
+
+        $this->assertFalse( $result );
+    }
+
+    public function test_empty_array_value_do_not_register_block_script_handle() {
+        $metadata = array( 'script' => array() );
+        $result   = register_block_script_handle( $metadata, 'script' );
+
+        $this->assertFalse( $result );
+    }
+
+    public function test_wrong_array_index_do_not_register_block_script_handle() {
+        $metadata = array( 'script' => array( 'test-script-handle' ) );
+        $result   = register_block_script_handle( $metadata, 'script', 1 );
 
         $this->assertFalse( $result );
@@ -232 +246 @@
     public function test_handle_passed_register_block_script_handle() {
         $metadata = array(
-            'editorScript' => 'test-script-handle',
-        );
-        $result   = register_block_script_handle( $metadata, 'editorScript' );
+            'script' => 'test-script-handle',
+        );
+        $result   = register_block_script_handle( $metadata, 'script' );
 
         $this->assertSame( 'test-script-handle', $result );
+    }
+
+    public function test_handles_passed_register_block_script_handles() {
+        $metadata = array(
+            'script' => array( 'test-script-handle', 'test-script-handle-2' ),
+        );
+
+        $result = register_block_script_handle( $metadata, 'script' );
+        $this->assertSame( 'test-script-handle', $result );
+
+        $result = register_block_script_handle( $metadata, 'script', 1 );
+        $this->assertSame( 'test-script-handle-2', $result, 1 );
     }
 
@@ -282 +308 @@
      * @ticket 50263
      */
-    public function test_empty_value_found_register_block_style_handle() {
+    public function test_empty_string_value_do_not_register_block_style_handle() {
         $metadata = array( 'style' => '' );
         $result   = register_block_style_handle( $metadata, 'style' );
@@ -289 +315 @@
     }
 
+    public function test_empty_array_value_do_not_register_block_style_handle() {
+        $metadata = array( 'style' => array() );
+        $result   = register_block_style_handle( $metadata, 'style' );
+
+        $this->assertFalse( $result );
+    }
+
+    public function test_wrong_array_index_do_not_register_block_style_handle() {
+        $metadata = array( 'style' => array( 'test-style-handle' ) );
+        $result   = register_block_style_handle( $metadata, 'style', 1 );
+
+        $this->assertFalse( $result );
+    }
+
     /**
      * @ticket 50263
@@ -299 +339 @@
 
         $this->assertSame( 'test-style-handle', $result );
+    }
+
+    public function test_handles_passed_register_block_style_handles() {
+        $metadata = array(
+            'style' => array( 'test-style-handle', 'test-style-handle-2' ),
+        );
+
+        $result = register_block_style_handle( $metadata, 'style' );
+        $this->assertSame( 'test-style-handle', $result );
+
+        $result = register_block_style_handle( $metadata, 'style', 1 );
+        $this->assertSame( 'test-style-handle-2', $result, 1 );
     }
 
@@ -443 +495 @@
             $result->example
         );
-        $this->assertSame( 'tests-notice-editor-script', $result->editor_script );
-        $this->assertSame( 'tests-notice-script', $result->script );
-        $this->assertSame( 'tests-notice-view-script', $result->view_script );
-        $this->assertSame( 'tests-notice-editor-style', $result->editor_style );
-        $this->assertSame( 'tests-notice-style', $result->style );
+        $this->assertSameSets(
+            array( 'tests-notice-editor-script' ),
+            $result->editor_script_handles
+        );
+        $this->assertSameSets(
+            array( 'tests-notice-script' ),
+            $result->script_handles
+        );
+        $this->assertSameSets(
+            array( 'tests-notice-view-script', 'tests-notice-view-script-2' ),
+            $result->view_script_handles
+        );
+        $this->assertSameSets(
+            array( 'tests-notice-editor-style' ),
+            $result->editor_style_handles
+        );
+        $this->assertSameSets(
+            array( 'tests-notice-style', 'tests-notice-style-2' ),
+            $result->style_handles
+        );
 
         // @ticket 50328