mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-06-28 14:20:15 +00:00
Editor: Update layout handling for block supports
Backports changes applied in the Gutenberg plugin planned for WordPress 6.0 release. See https://github.com/WordPress/gutenberg/issues/39889. Props ramonopoly, youknowriad. See #55505. git-svn-id: https://develop.svn.wordpress.org/trunk@53085 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Greg Ziółkowski
160
tests/phpunit/tests/block-supports/layout.php
Normal file
160
tests/phpunit/tests/block-supports/layout.php
Normal file
@@ -0,0 +1,160 @@
|
||||
<?php
|
||||
/**
|
||||
* Block supports tests for the layout.
|
||||
*
|
||||
* @package WordPress
|
||||
* @subpackage Block Supports
|
||||
* @since 6.0.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* Tests for block supports related to layout.
|
||||
*
|
||||
* @since 6.0.0
|
||||
*
|
||||
* @group block-supports
|
||||
*/
|
||||
class Test_Block_Supports_Layout extends WP_UnitTestCase {
|
||||
function set_up() {
|
||||
parent::set_up();
|
||||
$this->theme_root = realpath( DIR_TESTDATA . '/themedir1' );
|
||||
$this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
|
||||
|
||||
// /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
|
||||
$GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
|
||||
|
||||
// Set up the new root.
|
||||
add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
|
||||
add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
|
||||
add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
|
||||
|
||||
$this->queries = array();
|
||||
// Clear caches.
|
||||
wp_clean_themes_cache();
|
||||
unset( $GLOBALS['wp_themes'] );
|
||||
}
|
||||
|
||||
function tear_down() {
|
||||
$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
|
||||
|
||||
// Clear up the filters to modify the theme root.
|
||||
remove_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
|
||||
remove_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
|
||||
remove_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
|
||||
|
||||
wp_clean_themes_cache();
|
||||
unset( $GLOBALS['wp_themes'] );
|
||||
parent::tear_down();
|
||||
}
|
||||
|
||||
function filter_set_theme_root() {
|
||||
return $this->theme_root;
|
||||
}
|
||||
|
||||
/**
|
||||
* @ticket 55505
|
||||
*/
|
||||
function test_outer_container_not_restored_for_non_aligned_image_block_with_non_themejson_theme() {
|
||||
// The "default" theme doesn't have theme.json support.
|
||||
switch_theme( 'default' );
|
||||
$block = array(
|
||||
'blockName' => 'core/image',
|
||||
'attrs' => array(),
|
||||
);
|
||||
$block_content = '<figure class="wp-block-image size-full"><img src="/my-image.jpg"/></figure>';
|
||||
$expected = '<figure class="wp-block-image size-full"><img src="/my-image.jpg"/></figure>';
|
||||
|
||||
$this->assertSame( $expected, wp_restore_image_outer_container( $block_content, $block ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* @ticket 55505
|
||||
*/
|
||||
function test_outer_container_restored_for_aligned_image_block_with_non_themejson_theme() {
|
||||
// The "default" theme doesn't have theme.json support.
|
||||
switch_theme( 'default' );
|
||||
$block = array(
|
||||
'blockName' => 'core/image',
|
||||
'attrs' => array(),
|
||||
);
|
||||
$block_content = '<figure class="wp-block-image alignright size-full"><img src="/my-image.jpg"/></figure>';
|
||||
$expected = '<div class="wp-block-image"><figure class="alignright size-full"><img src="/my-image.jpg"/></figure></div>';
|
||||
|
||||
$this->assertSame( $expected, wp_restore_image_outer_container( $block_content, $block ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* @ticket 55505
|
||||
*
|
||||
* @dataProvider data_block_image_html_restored_outer_container
|
||||
*
|
||||
* @param string $block_image_html The block image HTML passed to `wp_restore_image_outer_container`.
|
||||
* @param string $expected The expected block image HTML.
|
||||
*/
|
||||
function test_additional_styles_moved_to_restored_outer_container_for_aligned_image_block_with_non_themejson_theme( $block_image_html, $expected ) {
|
||||
// The "default" theme doesn't have theme.json support.
|
||||
switch_theme( 'default' );
|
||||
$block = array(
|
||||
'blockName' => 'core/image',
|
||||
'attrs' => array(
|
||||
'className' => 'is-style-round my-custom-classname',
|
||||
),
|
||||
);
|
||||
|
||||
$this->assertSame( $expected, wp_restore_image_outer_container( $block_image_html, $block ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for test_additional_styles_moved_to_restored_outer_container_for_aligned_image_block_with_non_themejson_theme().
|
||||
*
|
||||
* @return array {
|
||||
* @type array {
|
||||
* @type string $block_image_html The block image HTML passed to `wp_restore_image_outer_container`.
|
||||
* @type string $expected The expected block image HTML.
|
||||
* }
|
||||
* }
|
||||
*/
|
||||
public function data_block_image_html_restored_outer_container() {
|
||||
$expected = '<div class="wp-block-image is-style-round my-custom-classname"><figure class="alignright size-full"><img src="/my-image.jpg"/></figure></div>';
|
||||
|
||||
return array(
|
||||
array(
|
||||
'<figure class="wp-block-image alignright size-full is-style-round my-custom-classname"><img src="/my-image.jpg"/></figure>',
|
||||
$expected,
|
||||
),
|
||||
array(
|
||||
'<figure class="is-style-round my-custom-classname wp-block-image alignright size-full"><img src="/my-image.jpg"/></figure>',
|
||||
$expected,
|
||||
),
|
||||
array(
|
||||
'<figure class="wp-block-image is-style-round my-custom-classname alignright size-full"><img src="/my-image.jpg"/></figure>',
|
||||
$expected,
|
||||
),
|
||||
array(
|
||||
'<figure class="is-style-round wp-block-image alignright my-custom-classname size-full"><img src="/my-image.jpg"/></figure>',
|
||||
$expected,
|
||||
),
|
||||
array(
|
||||
'<figure style="color: red" class=\'is-style-round wp-block-image alignright my-custom-classname size-full\' data-random-tag=">"><img src="/my-image.jpg"/></figure>',
|
||||
'<div class="wp-block-image is-style-round my-custom-classname"><figure style="color: red" class=\'alignright size-full\' data-random-tag=">"><img src="/my-image.jpg"/></figure></div>',
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @ticket 55505
|
||||
*/
|
||||
function test_outer_container_not_restored_for_aligned_image_block_with_themejson_theme() {
|
||||
switch_theme( 'block-theme' );
|
||||
$block = array(
|
||||
'blockName' => 'core/image',
|
||||
'attrs' => array(
|
||||
'className' => 'is-style-round my-custom-classname',
|
||||
),
|
||||
);
|
||||
$block_content = '<figure class="wp-block-image alignright size-full is-style-round my-custom-classname"><img src="/my-image.jpg"/></figure>';
|
||||
$expected = '<figure class="wp-block-image alignright size-full is-style-round my-custom-classname"><img src="/my-image.jpg"/></figure>';
|
||||
|
||||
$this->assertSame( $expected, wp_restore_image_outer_container( $block_content, $block ) );
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user