Skip to content

Block Hooks API: Update block-template-utils for first-last child template parts #6867

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

Closed
tjcafferkey wants to merge 30 commits into from
Closed

Block Hooks API: Update block-template-utils for first-last child template parts #6867

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b020b06
Update template utils to accommodate first_child and last_child hooke…
tjcafferkey Jun 20, 2024
6b78fcd
Insert ignoredHookedBlocks postmeta via rest_pre_insert_wp_template_p…
tjcafferkey Jun 24, 2024
1dccc50
Update comment
tjcafferkey Jun 24, 2024
87462d5
Update tests
tjcafferkey Jun 25, 2024
8978b80
Add assertion, change anchor block
ockham Jun 25, 2024
d5f6c30
Update tests
tjcafferkey Jun 26, 2024
0ed6e89
Remove duplciate get_post_meta call
tjcafferkey Jun 26, 2024
83040a6
Build correct context for the block hooks API when the post type is a…
tjcafferkey Jun 26, 2024
5e4876c
Test coverage
tjcafferkey Jun 27, 2024
1e3e362
Ensure that for template files _inject_theme_attribute_in_template_pa…
tjcafferkey Jun 27, 2024
f4062ad
Update comments
tjcafferkey Jun 28, 2024
6c95919
Remove update_ignored_hooked_blocks_postmeta from rest_pre_insert_wp_…
ockham Jul 1, 2024
0ceb66b
Add extract_serialized_parent_block helper
ockham Jul 1, 2024
5489657
Handle template-part first_child/last_child insertion in inject_ignor…
ockham Jul 1, 2024
46c73e0
Revert changes to update_ignored_hooked_blocks_postmeta
ockham Jul 1, 2024
9fa3ee7
Add note about _make_mock_parsed_block being internal use only
ockham Jul 1, 2024
e676f4b
Add test coverage
ockham Jul 1, 2024
560dcce
Revert changes to updateIgnoredHookedBlocksPostMeta test
ockham Jul 1, 2024
58c6689
Clean up post meta
ockham Jul 1, 2024
e7db202
Start fixing tests
ockham Jul 1, 2024
adacaae
Polish test
ockham Jul 1, 2024
b3377b3
Fix other tests
ockham Jul 1, 2024
97d4624
Add ticket numbers
ockham Jul 1, 2024
f324f96
Single quotes
ockham Jul 1, 2024
83cfa72
Polish other tests
ockham Jul 1, 2024
1ddf9d3
Add PHPDoc descriptions to _make_mock_parsed_block
ockham Jul 1, 2024
40464ce
Wrap a line
ockham Jul 1, 2024
5df1860
Revert "Wrap a line"
ockham Jul 1, 2024
1517c44
Rewrite to remove _make_mock_parsed_block
ockham Jul 1, 2024
b679595
Variable names
ockham Jul 1, 2024
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
Prev Previous commit
Next Next commit
Test coverage
  • Loading branch information
@tjcafferkey @ockham
tjcafferkey authored and ockham committed Jul 2, 2024
commit 5e4876c4aaee127d1bced7a72aff8237833a09f5
88 changes: 88 additions & 0 deletions tests/phpunit/tests/block-templates/buildBlockTemplateResultFromFile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@
* @covers ::_build_block_template_result_from_file
*/
class Tests_Block_Templates_BuildBlockTemplateResultFromFile extends WP_Block_Templates_UnitTestCase {
/**
* Tear down each test method.
*
* @since 6.7.0
*/
public function tear_down() {
$registry = WP_Block_Type_Registry::get_instance();

if ( $registry->is_registered( 'tests/my-block' ) ) {
$registry->unregister( 'tests/my-block' );
}

parent::tear_down();
}

/**
* @ticket 54335
Expand Down Expand Up @@ -178,4 +192,78 @@ public function test_should_ignore_post_types_property_when_building_template_pa

$this->assertEmpty( $template->post_types );
}

/**
* @ticket 60506
*/
public function test_should_inject_hooked_block_into_template_part() {
register_block_type(
'tests/my-block',
array(
'block_hooks' => array(
'core/paragraph' => 'after',
),
)
);

$template_part = _build_block_template_result_from_file(
array(
'slug' => 'header',
'postTypes' => array( 'post' ),
'path' => DIR_TESTDATA . '/templates/template.html',
),
'wp_template_part'
);
$this->assertStringEndsWith( '<!-- wp:tests/my-block /-->', $template_part->content );
}

/*
Copy link
Member

@mukeshpanchal27 mukeshpanchal27 Jul 2, 2024

Choose a reason for hiding this comment

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

Missing star. Same for some other unit tests

For ex. /**

Copy link
Contributor

@ockham ockham Jul 2, 2024

Choose a reason for hiding this comment

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

Good catch, thank you! I'll address in a follow-up.

* @ticket 60506
* @ticket 60854
*/
public function test_should_injected_hooked_block_into_template_part_first_child() {
register_block_type(
'tests/my-block',
array(
'block_hooks' => array(
'core/template-part' => 'first_child',
),
)
);

$template_part = _build_block_template_result_from_file(
array(
'slug' => 'header',
'postTypes' => array( 'post' ),
'path' => DIR_TESTDATA . '/templates/template.html',
),
'wp_template_part'
);
$this->assertStringStartsWith( '<!-- wp:tests/my-block /-->', $template_part->content );
}

/*
* @ticket 60506
* @ticket 60854
*/
public function test_should_injected_hooked_block_into_template_part_last_child() {
register_block_type(
'tests/my-block',
array(
'block_hooks' => array(
'core/template-part' => 'last_child',
),
)
);

$template_part = _build_block_template_result_from_file(
array(
'slug' => 'header',
'postTypes' => array( 'post' ),
'path' => DIR_TESTDATA . '/templates/template.html',
),
'wp_template_part'
);
$this->assertStringEndsWith( '<!-- wp:tests/my-block /-->', $template_part->content );
}
}
44 changes: 44 additions & 0 deletions tests/phpunit/tests/block-templates/buildBlockTemplateResultFromPost.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,50 @@ public function test_should_inject_hooked_block_into_template_part() {
$this->assertStringEndsWith( '<!-- wp:tests/my-block /-->', $template_part->content );
}

/*
* @ticket 59646
* @ticket 60506
* @ticket 60854
*/
public function test_should_injected_hooked_block_into_template_part_first_child() {
register_block_type(
'tests/my-block',
array(
'block_hooks' => array(
'core/template-part' => 'first_child',
),
)
);

$template_part = _build_block_template_result_from_post(
self::$template_part_post,
'wp_template_part'
);
$this->assertStringStartsWith( '<!-- wp:tests/my-block /-->', $template_part->content );
}

/*
* @ticket 59646
* @ticket 60506
* @ticket 60854
*/
public function test_should_injected_hooked_block_into_template_part_last_child() {
register_block_type(
'tests/my-block',
array(
'block_hooks' => array(
'core/template-part' => 'last_child',
),
)
);

$template_part = _build_block_template_result_from_post(
self::$template_part_post,
'wp_template_part'
);
$this->assertStringEndsWith( '<!-- wp:tests/my-block /-->', $template_part->content );
}

/**
* @ticket 59646
* @ticket 60506
Expand Down