Changeset 56644 for trunk/tests/phpunit/tests/block-template-utils.php

Timestamp:

09/21/2023 08:32:52 AM (3 years ago)

Author:

Bernhard Reiter

Message:

Blocks: Change traverse_and_serialize_block(s)'s callback signature.

During work on #59399, it was discovered that sibling block insertion wasn't likely going to work the way it was planned, which required devising an alternative solution. This new solution requires some changes to traverse_and_serialize_block(s):

• Change the signature of the existing callback such that:
  • the return value is a string that will be prepended to the result of the inner block traversal and serialization;
  • the function arguments are: a reference to the current block (so it can be modified inline, which is important e.g. for theme attribute insertion), the parent block, and the previous block (instead of the block index and chunk index).
• Add a second callback argument to traverse_and_serialize_block(s), which is called after the block is traversed and serialized.
  • Its function arguments are a reference to the current block, the parent block, and the next block.

Props gziolo.
Fixes #59412. See #59313.

File:

• trunk/tests/phpunit/tests/block-template-utils.php (modified) (6 diffs)

trunk/tests/phpunit/tests/block-template-utils.php

@@ -226 +226 @@
      */
     public function test_inject_theme_attribute_in_template_part_block() {
-        $template_part_block_without_theme_attribute = array(
+        $template_part_block = array(
             'blockName'    => 'core/template-part',
             'attrs'        => array(
@@ -239 +239 @@
         );
 
-        $actual   = _inject_theme_attribute_in_template_part_block( $template_part_block_without_theme_attribute );
+        _inject_theme_attribute_in_template_part_block( $template_part_block );
         $expected = array(
             'blockName'    => 'core/template-part',
@@ -255 +255 @@
         $this->assertSame(
             $expected,
-            $actual,
+            $template_part_block,
             '`theme` attribute was not correctly injected in template part block.'
         );
@@ -266 +266 @@
      */
     public function test_not_inject_theme_attribute_in_template_part_block_theme_attribute_exists() {
-        $template_part_block_with_existing_theme_attribute = array(
+        $template_part_block = array(
             'blockName'    => 'core/template-part',
             'attrs'        => array(
@@ -280 +280 @@
         );
 
-        $actual = _inject_theme_attribute_in_template_part_block( $template_part_block_with_existing_theme_attribute );
+        $expected = $template_part_block;
+        _inject_theme_attribute_in_template_part_block( $template_part_block );
         $this->assertSame(
-            $template_part_block_with_existing_theme_attribute,
-            $actual,
+            $expected,
+            $template_part_block,
             'Existing `theme` attribute in template part block was not respected by attribute injection.'
         );
@@ -302 +303 @@
         );
 
-        $actual = _inject_theme_attribute_in_template_part_block( $non_template_part_block );
+        $expected = $non_template_part_block;
+        _inject_theme_attribute_in_template_part_block( $non_template_part_block );
         $this->assertSame(
+            $expected,
             $non_template_part_block,
-            $actual,
             '`theme` attribute injection modified non-template-part block.'
         );