Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Blocks: Refactor the check against self for block hooks #5218

Closed
wants to merge 4 commits into from
Closed

Blocks: Refactor the check against self for block hooks #5218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbcaf33
Blocks: Refactor the check against self for block hooks
gziolo Sep 14, 2023
967798d
Ensure that only an array gets validated for block hooks
gziolo Sep 14, 2023
d70619c
Fix the spacing issue
gziolo Sep 14, 2023
2089f54
Refactor code based on the review feedback
gziolo Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions tests/phpunit/data/blocks/hooked-block-error/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "tests/hooked-block-error",
"description": "A block that throws an error because it tries to hook a block to itself.",
"blockHooks": {
"tests/hooked-block-error": "before",
"tests/other-block": "after"
}
}
5 changes: 4 additions & 1 deletion tests/phpunit/data/blocks/notice/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
"root": ".wp-block-notice"
},
"blockHooks": {
"core/post-content": "before"
"tests/before": "before",
"tests/after": "after",
"tests/first-child": "firstChild",
"tests/last-child": "lastChild"
},
"supports": {
"align": true,
Expand Down
27 changes: 25 additions & 2 deletions tests/phpunit/tests/blocks/register.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,13 @@ public function test_block_registers_with_metadata_fixture() {
'Block type should contain selectors from metadata.'
);
// @ticket 59346
$this->assertSame(
array( 'core/post-content' => 'before' ),
$this->assertSameSets(
array(
'tests/before' => 'before',
'tests/after' => 'after',
'tests/first-child' => 'first_child',
'tests/last-child' => 'last_child',
),
Comment on lines +649 to +654
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

$result->block_hooks,
'Block type should contain block hooks from metadata.'
);
Expand Down Expand Up @@ -1069,4 +1074,22 @@ public function test_register_block_style_name_without_spaces() {
$actual = register_block_style( 'core/query', $block_styles );
$this->assertTrue( $actual );
}

/**
* @ticket 59346
*
* @covers ::register_block_type
*
* @expectedIncorrectUsage register_block_type_from_metadata
*/
public function test_register_block_hooks_targeting_itself() {
$block_type = register_block_type(
DIR_TESTDATA . '/blocks/hooked-block-error'
);

$this->assertSame(
array( 'tests/other-block' => 'after' ),
$block_type->block_hooks
);
}
}
Loading