vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Blocks: Revert implementation of block insertion functions.

Browse Source 
In [56618], three functions (`insert_inner_block`, `prepend_inner_block`, and `append_inner_block`) were introduced. They were meant to be used for insertion of hooked blocks; however, it was discovered that the original idea wouldn't work for sibling insertion. Instead, a different approach will be taken (see #59412), and these functions are no longer needed and can thus be removed.

Reverts [56618].
See #59412, #59385, #59313.

git-svn-id: https://develop.svn.wordpress.org/trunk@56634 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Bernie Reiter
2023-09-20 16:47:44 +00:00
parent 58bb4b79ca
commit 8c0e0b3f89
2 changed files with 3 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
tests/phpunit/tests/blocks/blockHooks.php
View File

@@ -17,12 +17,9 @@ class Tests_Blocks_BlockHooks extends WP_UnitTestCase {
* @since 6.4.0
*/
public function tear_down() {
$registry = WP_Block_Type_Registry::get_instance();
$block_names = array(
'tests/injected-one',
'tests/injected-two',
);
foreach ( $block_names as $block_name ) {
$registry = WP_Block_Type_Registry::get_instance();
foreach ( array( 'tests/my-block', 'tests/my-container-block' ) as $block_name ) {
if ( $registry->is_registered( $block_name ) ) {
$registry->unregister( $block_name );
}
@@ -100,157 +97,4 @@ class Tests_Blocks_BlockHooks extends WP_UnitTestCase {
'block hooked at the last child position'
);
}
/**
* @ticket 59385
*
* @covers ::insert_inner_block
*
* @dataProvider data_insert_inner_block
*
* @param string $block_index Block index to insert the block at.
* @param string $expected_markup Expected markup after the block is inserted.
*/
public function test_insert_inner_block( $block_index, $expected_markup ) {
$original_markup = <<<HTML
<!-- wp:tests/group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group">
<!-- wp:paragraph -->
<p>Foo</p>
<!-- /wp:paragraph -->
</div>
<!-- /wp:tests/group -->
HTML;
$inserted_block = array(
'blockName' => 'tests/hooked-block',
'attrs' => array(),
'innerBlocks' => array(),
'innerHTML' => '',
'innerContent' => array(),
);
$expected = parse_blocks( $expected_markup )[0];
$block = parse_blocks( $original_markup )[0];
insert_inner_block( $block, $block_index, 1, $inserted_block );
$this->assertSame( $expected, $block );
}
/**
* Data provider.
*
* @return array[]
*/
public function data_insert_inner_block() {
$expected_before_markup = <<<HTML
<!-- wp:tests/group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group">
<!-- wp:tests/hooked-block /--><!-- wp:paragraph -->
<p>Foo</p>
<!-- /wp:paragraph -->
</div>
<!-- /wp:tests/group -->
HTML;
$expected_after_markup = <<<HTML
<!-- wp:tests/group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group">
<!-- wp:paragraph -->
<p>Foo</p>
<!-- /wp:paragraph --><!-- wp:tests/hooked-block /-->
</div>
<!-- /wp:tests/group -->
HTML;
return array(
'insert before given block' => array(
'block_index' => 0,
'expected_markup' => $expected_before_markup,
),
'insert after given block' => array(
'block_index' => 1,
'expected_markup' => $expected_after_markup,
),
);
}
/**
* @ticket 59385
*
* @covers ::prepend_inner_block
*/
public function test_prepend_inner_block() {
$original_markup = <<<HTML
<!-- wp:tests/group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group">
<!-- wp:paragraph -->
<p>Foo</p>
<!-- /wp:paragraph -->
</div>
<!-- /wp:tests/group -->
HTML;
$inserted_block = array(
'blockName' => 'tests/hooked-block',
'attrs' => array(),
'innerBlocks' => array(),
'innerHTML' => '',
'innerContent' => array(),
);
$expected_markup = <<<HTML
<!-- wp:tests/group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group">
<!-- wp:tests/hooked-block /--><!-- wp:paragraph -->
<p>Foo</p>
<!-- /wp:paragraph -->
</div>
<!-- /wp:tests/group -->
HTML;
$expected = parse_blocks( $expected_markup )[0];
$block = parse_blocks( $original_markup )[0];
prepend_inner_block( $block, $inserted_block );
$this->assertSame( $expected, $block );
}
/**
* @ticket 59385
*
* @covers ::append_inner_block
*/
public function test_append_inner_block() {
$original_markup = <<<HTML
<!-- wp:tests/group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group">
<!-- wp:paragraph -->
<p>Foo</p>
<!-- /wp:paragraph -->
</div>
<!-- /wp:tests/group -->
HTML;
$inserted_block = array(
'blockName' => 'tests/hooked-block',
'attrs' => array(),
'innerBlocks' => array(),
'innerHTML' => '',
'innerContent' => array(),
);
$expected_markup = <<<HTML
<!-- wp:tests/group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group">
<!-- wp:paragraph -->
<p>Foo</p>
<!-- /wp:paragraph --><!-- wp:tests/hooked-block /-->
</div>
<!-- /wp:tests/group -->
HTML;
$expected = parse_blocks( $expected_markup )[0];
$block = parse_blocks( $original_markup )[0];
append_inner_block( $block, $inserted_block );
$this->assertSame( $expected, $block );
}
}