Skip to content

Site Editor: Add missing export endpoint #1936

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
Mamaduka wants to merge 15 commits into from
Closed

Site Editor: Add missing export endpoint #1936

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
191d85d
Site Editor: Add missing export endpoint
Mamaduka Nov 24, 2021
e74a881
Don't use RDONLY constant in tests
Mamaduka Nov 24, 2021
275656f
Use numFiles
Mamaduka Nov 24, 2021
f441c4d
Update WP API fixtures
Mamaduka Nov 24, 2021
55cab98
Use new folder names
Mamaduka Nov 26, 2021
b02f8f3
Remove texdomain
Mamaduka Nov 29, 2021
0d5916e
Update src/wp-includes/block-template-utils.php
Mamaduka Nov 29, 2021
2b40531
Update src/wp-includes/rest-api/endpoints/class-wp-rest-edit-site-exp…
Mamaduka Nov 29, 2021
f7fe3c4
Merge branch 'trunk' into add/edit-site-export
peterwilsoncc Nov 30, 2021
48dd608
Ticket DocBlock
Mamaduka Nov 30, 2021
0473b9c
Use plain language
Mamaduka Nov 30, 2021
8388d27
Improve nesting
Mamaduka Nov 30, 2021
80bbb6d
Use data provider
Mamaduka Nov 30, 2021
8aec83d
Merge branch 'trunk' into add/edit-site-export
spacedmonkey Nov 30, 2021
7c78e4f
Tweaks and add comments.
spacedmonkey Nov 30, 2021
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
Use data provider
  • Loading branch information
@Mamaduka
Mamaduka committed Nov 30, 2021
commit 80bbb6d24fc2d3b3413967195868b9c425f13583
47 changes: 27 additions & 20 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 @@ -191,27 +191,34 @@ function test_inject_theme_attribute_in_block_template_content() {

/**
* @ticket 54448
*
* @dataProvider data_remove_theme_attribute_in_block_template_content
*/
function test_remove_theme_attribute_in_block_template_content() {
$content_with_existing_theme_attribute = '<!-- wp:template-part {"slug":"header","theme":"tt1-blocks","align":"full","tagName":"header","className":"site-header"} /-->';
$template_content = _remove_theme_attribute_in_block_template_content( $content_with_existing_theme_attribute );
$expected = '<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header"} /-->';
$this->assertEquals( $expected, $template_content );

$content_with_existing_theme_attribute_nested = '<!-- wp:group --><!-- wp:template-part {"slug":"header","theme":"tt1-blocks","align":"full","tagName":"header","className":"site-header"} /--><!-- /wp:group -->';
$template_content = _remove_theme_attribute_in_block_template_content( $content_with_existing_theme_attribute_nested );
$expected = '<!-- wp:group --><!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header"} /--><!-- /wp:group -->';
$this->assertEquals( $expected, $template_content );

// Does not modify content when there is no existing theme attribute.
$content_without_theme_attribute = '<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header"} /-->';
$template_content = _remove_theme_attribute_in_block_template_content( $content_without_theme_attribute );
$this->assertEquals( $content_without_theme_attribute, $template_content );

// Does not remove theme when there is no template part.
$content_with_no_template_part = '<!-- wp:post-content /-->';
$template_content = _remove_theme_attribute_in_block_template_content( $content_with_no_template_part );
$this->assertEquals( $content_with_no_template_part, $template_content );
function test_remove_theme_attribute_in_block_template_content( $template_content, $expected ) {
$this->assertEquals( $expected, _remove_theme_attribute_in_block_template_content( $template_content ) );
Copy link
Contributor

@peterwilsoncc peterwilsoncc Dec 1, 2021

Choose a reason for hiding this comment

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

Suggested change
$this->assertEquals( $expected, _remove_theme_attribute_in_block_template_content( $template_content ) );
$this->assertSame( $expected, _remove_theme_attribute_in_block_template_content( $template_content ) );

}

function data_remove_theme_attribute_in_block_template_content() {
return array(
array(
'<!-- wp:template-part {"slug":"header","theme":"tt1-blocks","align":"full","tagName":"header","className":"site-header"} /-->',
'<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header"} /-->',
),
array(
'<!-- wp:group --><!-- wp:template-part {"slug":"header","theme":"tt1-blocks","align":"full","tagName":"header","className":"site-header"} /--><!-- /wp:group -->',
'<!-- wp:group --><!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header"} /--><!-- /wp:group -->',
),
// Does not modify content when there is no existing theme attribute.
array(
'<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header"} /-->',
'<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header"} /-->',
),
// Does not remove theme when there is no template part.
array(
'<!-- wp:post-content /-->',
'<!-- wp:post-content /-->',
),
);
}

/**
Expand Down