mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-02-27 11:12:50 +00:00
Decouple hooked blocks insertion from setting the `metadata.ignoredHookedBlocks` attribute on anchor blocks, and perform the latter step upon saving a template or template part to the database. This ensures that anchor blocks that have been newly added to a template (or part) on the client side will also get `ignoredHookedBlocks` metadata set correctly, thus preserving editor/front-end parity. Hooked block insertion, on the other hand, will continue to happen upon ''reading'' a template (or part). Props gziolo, tomjcafferkey. Fixes #60506. git-svn-id: https://develop.svn.wordpress.org/trunk@57627 602fd350-edb4-49c9-b593-d223f7449a82
184 lines
4.9 KiB
PHP
184 lines
4.9 KiB
PHP
<?php
|
|
/**
|
|
* Tests for the insert_hooked_blocks function.
|
|
*
|
|
* @package WordPress
|
|
* @subpackage Blocks
|
|
*
|
|
* @since 6.5.0
|
|
*
|
|
* @group blocks
|
|
* @group block-hooks
|
|
*/
|
|
class Tests_Blocks_InsertHookedBlocks extends WP_UnitTestCase {
|
|
const ANCHOR_BLOCK_TYPE = 'tests/anchor-block';
|
|
const HOOKED_BLOCK_TYPE = 'tests/hooked-block';
|
|
const OTHER_HOOKED_BLOCK_TYPE = 'tests/other-hooked-block';
|
|
|
|
const HOOKED_BLOCKS = array(
|
|
self::ANCHOR_BLOCK_TYPE => array(
|
|
'after' => array( self::HOOKED_BLOCK_TYPE ),
|
|
'before' => array( self::OTHER_HOOKED_BLOCK_TYPE ),
|
|
),
|
|
);
|
|
|
|
/**
|
|
* @ticket 59572
|
|
* @ticket 60126
|
|
* @ticket 60506
|
|
*
|
|
* @covers ::insert_hooked_blocks
|
|
*/
|
|
public function test_insert_hooked_blocks_returns_correct_markup() {
|
|
$anchor_block = array(
|
|
'blockName' => self::ANCHOR_BLOCK_TYPE,
|
|
);
|
|
|
|
$actual = insert_hooked_blocks( $anchor_block, 'after', self::HOOKED_BLOCKS, array() );
|
|
$this->assertSame(
|
|
'<!-- wp:' . self::HOOKED_BLOCK_TYPE . ' /-->',
|
|
$actual,
|
|
"Markup for hooked block wasn't generated correctly."
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @ticket 59572
|
|
* @ticket 60126
|
|
* @ticket 60506
|
|
*
|
|
* @covers ::insert_hooked_blocks
|
|
*/
|
|
public function test_insert_hooked_blocks_if_block_is_ignored() {
|
|
$anchor_block = array(
|
|
'blockName' => 'tests/anchor-block',
|
|
'attrs' => array(
|
|
'metadata' => array(
|
|
'ignoredHookedBlocks' => array( self::HOOKED_BLOCK_TYPE ),
|
|
),
|
|
),
|
|
);
|
|
|
|
$actual = insert_hooked_blocks( $anchor_block, 'after', self::HOOKED_BLOCKS, array() );
|
|
$this->assertSame(
|
|
'',
|
|
$actual,
|
|
"No markup should've been generated for ignored hooked block."
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @ticket 59572
|
|
* @ticket 60126
|
|
* @ticket 60506
|
|
*
|
|
* @covers ::insert_hooked_blocks
|
|
*/
|
|
public function test_insert_hooked_blocks_if_other_block_is_ignored() {
|
|
$anchor_block = array(
|
|
'blockName' => 'tests/anchor-block',
|
|
'attrs' => array(
|
|
'metadata' => array(
|
|
'ignoredHookedBlocks' => array( self::HOOKED_BLOCK_TYPE ),
|
|
),
|
|
),
|
|
);
|
|
|
|
$actual = insert_hooked_blocks( $anchor_block, 'before', self::HOOKED_BLOCKS, array() );
|
|
$this->assertSame(
|
|
'<!-- wp:' . self::OTHER_HOOKED_BLOCK_TYPE . ' /-->',
|
|
$actual,
|
|
"Markup for newly hooked block should've been generated."
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @ticket 59572
|
|
* @ticket 60126
|
|
* @ticket 60506
|
|
*
|
|
* @covers ::insert_hooked_blocks
|
|
*/
|
|
public function test_insert_hooked_blocks_filter_can_set_attributes() {
|
|
$anchor_block = array(
|
|
'blockName' => self::ANCHOR_BLOCK_TYPE,
|
|
'attrs' => array(
|
|
'layout' => array(
|
|
'type' => 'constrained',
|
|
),
|
|
),
|
|
'innerContent' => array(),
|
|
);
|
|
|
|
$filter = function ( $parsed_hooked_block, $relative_position, $parsed_anchor_block ) {
|
|
// Is the hooked block adjacent to the anchor block?
|
|
if ( 'before' !== $relative_position && 'after' !== $relative_position ) {
|
|
return $parsed_hooked_block;
|
|
}
|
|
|
|
// Does the anchor block have a layout attribute?
|
|
if ( isset( $parsed_anchor_block['attrs']['layout'] ) ) {
|
|
// Copy the anchor block's layout attribute to the hooked block.
|
|
$parsed_hooked_block['attrs']['layout'] = $parsed_anchor_block['attrs']['layout'];
|
|
}
|
|
|
|
return $parsed_hooked_block;
|
|
};
|
|
add_filter( 'hooked_block_' . self::HOOKED_BLOCK_TYPE, $filter, 10, 3 );
|
|
$actual = insert_hooked_blocks( $anchor_block, 'after', self::HOOKED_BLOCKS, array() );
|
|
remove_filter( 'hooked_block_' . self::HOOKED_BLOCK_TYPE, $filter, 10, 3 );
|
|
|
|
$this->assertSame(
|
|
'<!-- wp:' . self::HOOKED_BLOCK_TYPE . ' {"layout":{"type":"constrained"}} /-->',
|
|
$actual,
|
|
"Markup wasn't generated correctly for hooked block with attribute set by filter."
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @ticket 59572
|
|
* @ticket 60126
|
|
* @ticket 60506
|
|
*
|
|
* @covers ::insert_hooked_blocks
|
|
*/
|
|
public function test_insert_hooked_blocks_filter_can_wrap_block() {
|
|
$anchor_block = array(
|
|
'blockName' => self::ANCHOR_BLOCK_TYPE,
|
|
'attrs' => array(
|
|
'layout' => array(
|
|
'type' => 'constrained',
|
|
),
|
|
),
|
|
'innerContent' => array(),
|
|
);
|
|
|
|
$filter = function ( $parsed_hooked_block ) {
|
|
if ( self::HOOKED_BLOCK_TYPE !== $parsed_hooked_block['blockName'] ) {
|
|
return $parsed_hooked_block;
|
|
}
|
|
|
|
// Wrap the block in a Group block.
|
|
return array(
|
|
'blockName' => 'core/group',
|
|
'attrs' => array(),
|
|
'innerBlocks' => array( $parsed_hooked_block ),
|
|
'innerContent' => array(
|
|
'<div class="wp-block-group">',
|
|
null,
|
|
'</div>',
|
|
),
|
|
);
|
|
};
|
|
add_filter( 'hooked_block_' . self::HOOKED_BLOCK_TYPE, $filter, 10, 3 );
|
|
$actual = insert_hooked_blocks( $anchor_block, 'after', self::HOOKED_BLOCKS, array() );
|
|
remove_filter( 'hooked_block_' . self::HOOKED_BLOCK_TYPE, $filter, 10, 3 );
|
|
|
|
$this->assertSame(
|
|
'<!-- wp:group --><div class="wp-block-group"><!-- wp:' . self::HOOKED_BLOCK_TYPE . ' /--></div><!-- /wp:group -->',
|
|
$actual,
|
|
"Markup wasn't generated correctly for hooked block wrapped in Group block by filter."
|
|
);
|
|
}
|
|
}
|