Skip to content

Block Themes: Ensure that _build_block_template_result_from_file() injects theme attribute #5186

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
ockham wants to merge 11 commits into from
Closed

Block Themes: Ensure that _build_block_template_result_from_file() injects theme attribute #5186

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3ce75ce
Block Themes: Ensure that _build_block_template_result_from_file() in…
ockham Sep 11, 2023
21bdf9e
Placate linter
ockham Sep 11, 2023
f8a23a6
Add one more test case
ockham Sep 11, 2023
779f107
Add more information to data provider's docblock
ockham Sep 12, 2023
e3e00f6
Rename data provider's argument to expected
ockham Sep 12, 2023
889941f
Add docblock for data provider
ockham Sep 12, 2023
3d552d5
Use DIR_TESTDATA
ockham Sep 12, 2023
0f0c7c0
Add keys to data provider
ockham Sep 12, 2023
8bf9f01
Whitespace
ockham Sep 12, 2023
5e242ce
Restore accidentally deleted .npmrc file
ockham Sep 12, 2023
4d6cf82
Remove extraneous newline
ockham Sep 12, 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
1 change: 0 additions & 1 deletion src/wp-content/themes/twentytwentyone/.npmrc
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions tests/phpunit/data/templates/template-with-nested-template-part.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<!-- wp:group -->
<!-- wp:template-part {"slug":"header","align":"full", "tagName":"header","className":"site-header"} /-->
<!-- /wp:group -->
1 change: 1 addition & 0 deletions tests/phpunit/data/templates/template-with-template-part-with-existing-theme-attribute.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- wp:template-part {"slug":"header","theme":"fake-theme","align":"full", "tagName":"header","className":"site-header"} /-->
1 change: 1 addition & 0 deletions tests/phpunit/data/templates/template-with-template-part.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- wp:template-part {"slug":"header","align":"full", "tagName":"header","className":"site-header"} /-->
47 changes: 47 additions & 0 deletions tests/phpunit/tests/block-template-utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,53 @@ public function test_build_block_template_result_from_file() {
$this->assertEmpty( $template_part->modified );
}

/**
* @dataProvider data_build_block_template_result_from_file_injects_theme_attribute
*/
public function test_build_block_template_result_from_file_injects_theme_attribute( $filename, $expected_content ) {
$template = _build_block_template_result_from_file(
array(
'slug' => 'single',
'path' => __DIR__ . '/../data/templates/' . $filename,
),
'wp_template'
);
$this->assertSame( $expected_content, $template->content );
}

public function data_build_block_template_result_from_file_injects_theme_attribute() {
$theme = 'block-theme';
return array(
array(
'template-with-template-part.html',
sprintf(
'<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header","theme":"%s"} /-->',
$theme
),
),
array(
'template-with-nested-template-part.html',
sprintf(
'<!-- wp:group -->
<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header","theme":"%s"} /-->
<!-- /wp:group -->',
$theme
),
),
array(
'template-with-template-part-with-existing-theme-attribute.html',
'<!-- wp:template-part {"slug":"header","theme":"fake-theme","align":"full", "tagName":"header","className":"site-header"} /-->',
),
array(
'template.html',
'<!-- wp:paragraph -->
<p>Just a paragraph</p>
<!-- /wp:paragraph -->',
),
);
}


public function test_inject_theme_attribute_in_block_template_content() {
$theme = get_stylesheet();
$content_without_theme_attribute = '<!-- wp:template-part {"slug":"header","align":"full", "tagName":"header","className":"site-header"} /-->';
Expand Down