+ { children }
);
}
diff --git a/packages/nux/src/components/dot-tip/test/__snapshots__/index.js.snap b/packages/nux/src/components/dot-tip/test/__snapshots__/index.js.snap
index 876bae4b69088..a453da0254b48 100644
--- a/packages/nux/src/components/dot-tip/test/__snapshots__/index.js.snap
+++ b/packages/nux/src/components/dot-tip/test/__snapshots__/index.js.snap
@@ -5,7 +5,7 @@ exports[`DotTip should render correctly 1`] = `
aria-label="Editor tips"
class="components-popover nux-dot-tip is-positioned"
role="dialog"
- style="position: absolute; opacity: 0; transform: translateX(-2em) scale(0) translateZ(0); transform-origin: 0% 50% 0; left: 0px; top: 0px;"
+ style="position: absolute; top: 0px; left: 0px; opacity: 0; transform: translateX(-2em) scale(0) translateZ(0); transform-origin: 0% 50% 0;"
tabindex="-1"
>
{
+// Disabled for now on Android see https://github.com/wordpress-mobile/gutenberg-mobile/issues/5321
+const onlyOniOS = ! isAndroid() ? describe : describe.skip;
+
+onlyOniOS( 'Gutenberg Editor Unsupported Block Editor Tests', () => {
it( 'should be able to open the unsupported block web view editor', async () => {
await editorPage.setHtmlContent( testData.unsupportedBlockHtml );
diff --git a/packages/style-engine/class-wp-style-engine.php b/packages/style-engine/class-wp-style-engine.php
index f5636c150c3ee..0fd0aeac60e7c 100644
--- a/packages/style-engine/class-wp-style-engine.php
+++ b/packages/style-engine/class-wp-style-engine.php
@@ -206,6 +206,12 @@ final class WP_Style_Engine {
),
'path' => array( 'typography', 'lineHeight' ),
),
+ 'textColumns' => array(
+ 'property_keys' => array(
+ 'default' => 'column-count',
+ ),
+ 'path' => array( 'typography', 'textColumns' ),
+ ),
'textDecoration' => array(
'property_keys' => array(
'default' => 'text-decoration',
diff --git a/packages/style-engine/src/styles/typography/index.ts b/packages/style-engine/src/styles/typography/index.ts
index 48effa0b2b8a9..75e02c9643051 100644
--- a/packages/style-engine/src/styles/typography/index.ts
+++ b/packages/style-engine/src/styles/typography/index.ts
@@ -76,6 +76,18 @@ const lineHeight = {
},
};
+const textColumns = {
+ name: 'textColumns',
+ generate: ( style: Style, options: StyleOptions ) => {
+ return generateRule(
+ style,
+ options,
+ [ 'typography', 'textColumns' ],
+ 'columnCount'
+ );
+ },
+};
+
const textDecoration = {
name: 'textDecoration',
generate: ( style: Style, options: StyleOptions ) => {
@@ -107,6 +119,7 @@ export default [
fontWeight,
letterSpacing,
lineHeight,
+ textColumns,
textDecoration,
textTransform,
];
diff --git a/packages/style-engine/src/test/index.js b/packages/style-engine/src/test/index.js
index a94bd8a425681..fac55b4000e58 100644
--- a/packages/style-engine/src/test/index.js
+++ b/packages/style-engine/src/test/index.js
@@ -72,6 +72,7 @@ describe( 'generate', () => {
fontWeight: '800',
fontFamily: "'Helvetica Neue',sans-serif",
lineHeight: '3.3',
+ textColumns: '2',
textDecoration: 'line-through',
letterSpacing: '12px',
textTransform: 'uppercase',
@@ -88,7 +89,7 @@ describe( 'generate', () => {
}
)
).toEqual(
- ".some-selector { color: #cccccc; background: linear-gradient(135deg,rgb(255,203,112) 0%,rgb(33,32,33) 42%,rgb(65,88,208) 100%); background-color: #111111; min-height: 50vh; outline-color: red; outline-style: dashed; outline-offset: 2px; outline-width: 4px; margin-top: 11px; margin-right: 12px; margin-bottom: 13px; margin-left: 14px; padding-top: 10px; padding-bottom: 5px; font-family: 'Helvetica Neue',sans-serif; font-size: 2.2rem; font-style: italic; font-weight: 800; letter-spacing: 12px; line-height: 3.3; text-decoration: line-through; text-transform: uppercase; }"
+ ".some-selector { color: #cccccc; background: linear-gradient(135deg,rgb(255,203,112) 0%,rgb(33,32,33) 42%,rgb(65,88,208) 100%); background-color: #111111; min-height: 50vh; outline-color: red; outline-style: dashed; outline-offset: 2px; outline-width: 4px; margin-top: 11px; margin-right: 12px; margin-bottom: 13px; margin-left: 14px; padding-top: 10px; padding-bottom: 5px; font-family: 'Helvetica Neue',sans-serif; font-size: 2.2rem; font-style: italic; font-weight: 800; letter-spacing: 12px; line-height: 3.3; column-count: 2; text-decoration: line-through; text-transform: uppercase; }"
);
} );
@@ -242,6 +243,7 @@ describe( 'getCSSRules', () => {
fontWeight: '800',
fontFamily: "'Helvetica Neue',sans-serif",
lineHeight: '3.3',
+ textColumns: '2',
textDecoration: 'line-through',
letterSpacing: '12px',
textTransform: 'uppercase',
@@ -349,6 +351,11 @@ describe( 'getCSSRules', () => {
key: 'lineHeight',
value: '3.3',
},
+ {
+ selector: '.some-selector',
+ key: 'columnCount',
+ value: '2',
+ },
{
selector: '.some-selector',
key: 'textDecoration',
diff --git a/packages/style-engine/src/types.ts b/packages/style-engine/src/types.ts
index 0063cd56621c6..23d3e38cc43c2 100644
--- a/packages/style-engine/src/types.ts
+++ b/packages/style-engine/src/types.ts
@@ -52,6 +52,7 @@ export interface Style {
fontStyle?: CSSProperties[ 'fontStyle' ];
letterSpacing?: CSSProperties[ 'letterSpacing' ];
lineHeight?: CSSProperties[ 'lineHeight' ];
+ textColumns?: CSSProperties[ 'columnCount' ];
textDecoration?: CSSProperties[ 'textDecoration' ];
textTransform?: CSSProperties[ 'textTransform' ];
};
diff --git a/packages/widgets/src/index.js b/packages/widgets/src/index.js
index 6c88d65556d8b..e55b16ff12b35 100644
--- a/packages/widgets/src/index.js
+++ b/packages/widgets/src/index.js
@@ -18,11 +18,21 @@ export * from './utils';
* Note that for the block to be useful, any scripts required by a widget must
* be loaded into the page.
*
+ * @param {Object} supports Block support settings.
* @see https://developer.wordpress.org/block-editor/how-to-guides/widgets/legacy-widget-block/
*/
-export function registerLegacyWidgetBlock() {
+export function registerLegacyWidgetBlock( supports = {} ) {
const { metadata, settings, name } = legacyWidget;
- registerBlockType( { name, ...metadata }, settings );
+ registerBlockType(
+ { name, ...metadata },
+ {
+ ...settings,
+ supports: {
+ ...settings.supports,
+ ...supports,
+ },
+ }
+ );
}
/**
diff --git a/phpunit/block-supports/typography-test.php b/phpunit/block-supports/typography-test.php
index 63fd98d1e524f..1b9b6f97c63f6 100644
--- a/phpunit/block-supports/typography-test.php
+++ b/phpunit/block-supports/typography-test.php
@@ -557,22 +557,18 @@ public function data_generate_font_size_preset_fixtures() {
/**
* Tests that custom font sizes are converted to fluid values
* in inline block supports styles,
- * when "settings.typography.fluid" is set to `true`.
+ * when "settings.typography.fluid" is set to `true` or contains configured values.
*
* @covers ::gutenberg_register_typography_support
*
* @dataProvider data_generate_block_supports_font_size_fixtures
*
- * @param string $font_size_value The block supports custom font size value.
- * @param bool $should_use_fluid_typography An override to switch fluid typography "on". Can be used for unit testing.
- * @param string $expected_output Expected value of style property from gutenberg_apply_typography_support().
+ * @param string $font_size_value The block supports custom font size value.
+ * @param string $theme_slug A theme slug corresponding to an available test theme.
+ * @param string $expected_output Expected value of style property from gutenberg_apply_typography_support().
*/
- public function test_should_covert_font_sizes_to_fluid_values( $font_size_value, $should_use_fluid_typography, $expected_output ) {
- if ( $should_use_fluid_typography ) {
- switch_theme( 'block-theme-child-with-fluid-typography' );
- } else {
- switch_theme( 'default' );
- }
+ public function test_should_covert_font_sizes_to_fluid_values( $font_size_value, $theme_slug, $expected_output ) {
+ switch_theme( $theme_slug );
$this->test_block_name = 'test/font-size-fluid-value';
register_block_type(
@@ -614,15 +610,30 @@ public function test_should_covert_font_sizes_to_fluid_values( $font_size_value,
*/
public function data_generate_block_supports_font_size_fixtures() {
return array(
- 'default_return_value' => array(
- 'font_size_value' => '50px',
- 'should_use_fluid_typography' => false,
- 'expected_output' => 'font-size:50px;',
- ),
- 'return_value_with_fluid_typography' => array(
- 'font_size_value' => '50px',
- 'should_use_fluid_typography' => true,
- 'expected_output' => 'font-size:clamp(37.5px, 2.344rem + ((1vw - 7.68px) * 1.502), 50px);',
+ 'returns value when fluid typography is not active' => array(
+ 'font_size_value' => '15px',
+ 'theme_slug' => 'default',
+ 'expected_output' => 'font-size:15px;',
+ ),
+ 'returns clamp value using default config' => array(
+ 'font_size_value' => '15px',
+ 'theme_slug' => 'block-theme-child-with-fluid-typography',
+ 'expected_output' => 'font-size:clamp(14px, 0.875rem + ((1vw - 7.68px) * 0.12), 15px);',
+ ),
+ 'returns value when font size <= default min font size bound' => array(
+ 'font_size_value' => '13px',
+ 'theme_slug' => 'block-theme-child-with-fluid-typography',
+ 'expected_output' => 'font-size:13px;',
+ ),
+ 'returns clamp value using custom fluid config' => array(
+ 'font_size_value' => '17px',
+ 'theme_slug' => 'block-theme-child-with-fluid-typography-config',
+ 'expected_output' => 'font-size:clamp(16px, 1rem + ((1vw - 7.68px) * 0.12), 17px);',
+ ),
+ 'returns value when font size <= custom min font size bound' => array(
+ 'font_size_value' => '15px',
+ 'theme_slug' => 'block-theme-child-with-fluid-typography-config',
+ 'expected_output' => 'font-size:15px;',
),
);
}
diff --git a/phpunit/class-gutenberg-rest-block-patterns-controller-test.php b/phpunit/class-gutenberg-rest-block-patterns-controller-test.php
index ad6f42b033e84..9f9cf60f0572a 100644
--- a/phpunit/class-gutenberg-rest-block-patterns-controller-test.php
+++ b/phpunit/class-gutenberg-rest-block-patterns-controller-test.php
@@ -10,27 +10,54 @@
* Unit tests for REST API for Block Patterns.
*
* @group restapi
- * @covers Gutenberg_REST_Block_Patterns_Controller
+ * @covers Gutenberg_REST_Block_Patterns_Controller_6_2
*/
-class Gutenberg_REST_Block_Patterns_Controller_Test extends WP_Test_REST_Controller_Testcase {
+class Gutenberg_REST_Block_Patterns_Controller_6_2_Test extends WP_Test_REST_Controller_Testcase {
+ /**
+ * Admin user ID.
+ *
+ * @since 6.0.0
+ *
+ * @var int
+ */
protected static $admin_id;
+
+ /**
+ * Original instance of WP_Block_Patterns_Registry.
+ *
+ * @since 6.0.0
+ *
+ * @var WP_Block_Patterns_Registry
+ */
protected static $orig_registry;
- public function set_up() {
- parent::set_up();
- switch_theme( 'emptytheme' );
- }
+ /**
+ * Instance of the reflected `instance` property.
+ *
+ * @since 6.0.0
+ *
+ * @var ReflectionProperty
+ */
+ private static $registry_instance_property;
+
+ /**
+ * The REST API route.
+ *
+ * @since 6.0.0
+ *
+ * @var string
+ */
+ const REQUEST_ROUTE = '/wp/v2/block-patterns/patterns';
public static function wpSetUpBeforeClass( $factory ) {
- // Create a test user.
self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
// Setup an empty testing instance of `WP_Block_Patterns_Registry` and save the original.
- $reflection = new ReflectionClass( 'WP_Block_Patterns_Registry' );
- $reflection->getProperty( 'instance' )->setAccessible( true );
- self::$orig_registry = $reflection->getStaticPropertyValue( 'instance' );
- $test_registry = new WP_Block_Patterns_Registry();
- $reflection->setStaticPropertyValue( 'instance', $test_registry );
+ self::$orig_registry = WP_Block_Patterns_Registry::get_instance();
+ self::$registry_instance_property = new ReflectionProperty( 'WP_Block_Patterns_Registry', 'instance' );
+ self::$registry_instance_property->setAccessible( true );
+ $test_registry = new WP_Block_Pattern_Categories_Registry();
+ self::$registry_instance_property->setValue( $test_registry );
// Register some patterns in the test registry.
$test_registry->register(
@@ -51,47 +78,77 @@ public static function wpSetUpBeforeClass( $factory ) {
'content' => '
Two
',
)
);
+
+ $test_registry->register(
+ 'test/three',
+ array(
+ 'title' => 'Pattern Three',
+ 'categories' => array( 'test', 'buttons', 'query' ),
+ 'content' => '
Three
',
+ )
+ );
}
public static function wpTearDownAfterClass() {
- // Delete the test user.
self::delete_user( self::$admin_id );
// Restore the original registry instance.
- $reflection = new ReflectionClass( 'WP_Block_Patterns_Registry' );
- $reflection->setStaticPropertyValue( 'instance', self::$orig_registry );
+ self::$registry_instance_property->setValue( self::$orig_registry );
+ self::$registry_instance_property->setAccessible( false );
+ self::$registry_instance_property = null;
+ self::$orig_registry = null;
}
- public function test_register_routes() {
- $routes = rest_get_server()->get_routes();
- $this->assertArrayHasKey(
- '/wp/v2/block-patterns/patterns',
- $routes,
- 'The patterns route does not exist'
- );
+ public function set_up() {
+ parent::set_up();
+ switch_theme( 'emptytheme' );
}
- public function test_get_items() {
+ public function test_get_items_migrate_pattern_categories() {
wp_set_current_user( self::$admin_id );
- $expected_names = array( 'test/one', 'test/two' );
- $expected_fields = array( 'name', 'content' );
-
- $request = new WP_REST_Request( 'GET', '/wp/v2/block-patterns/patterns' );
- $request['_fields'] = 'name,content';
+ $request = new WP_REST_Request( 'GET', static::REQUEST_ROUTE );
+ $request['_fields'] = 'name,categories';
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
- $this->assertCount( count( $expected_names ), $data );
- foreach ( $data as $idx => $item ) {
- $this->assertEquals( $expected_names[ $idx ], $item['name'] );
- $this->assertEquals( $expected_fields, array_keys( $item ) );
- }
+ $this->assertIsArray( $data, 'WP_REST_Block_Patterns_Controller::get_items() should return an array' );
+ $this->assertGreaterThanOrEqual( 3, count( $data ), 'WP_REST_Block_Patterns_Controller::get_items() should return at least 3 items' );
+ $this->assertSame(
+ array(
+ 'name' => 'test/one',
+ 'categories' => array( 'test' ),
+ ),
+ $data[0],
+ 'WP_REST_Block_Patterns_Controller::get_items() should return test/one'
+ );
+ $this->assertSame(
+ array(
+ 'name' => 'test/two',
+ 'categories' => array( 'test' ),
+ ),
+ $data[1],
+ 'WP_REST_Block_Patterns_Controller::get_items() should return test/two'
+ );
+ $this->assertSame(
+ array(
+ 'name' => 'test/three',
+ 'categories' => array( 'test', 'call-to-action', 'posts' ),
+ ),
+ $data[2],
+ 'WP_REST_Block_Patterns_Controller::get_items() should return test/three'
+ );
}
/**
* Abstract methods that we must implement.
*/
+ public function test_register_routes() {
+ $this->markTestIncomplete();
+ }
+ public function test_get_items() {
+ $this->markTestIncomplete();
+ }
public function test_context_param() {
$this->markTestIncomplete();
}
diff --git a/phpunit/class-wp-theme-json-test.php b/phpunit/class-wp-theme-json-test.php
index 15932f7398bfa..a5413766ca7dd 100644
--- a/phpunit/class-wp-theme-json-test.php
+++ b/phpunit/class-wp-theme-json-test.php
@@ -751,6 +751,50 @@ public function test_get_stylesheet_with_block_support_feature_level_selectors()
$this->assertEquals( $expected, $theme_json->get_stylesheet() );
}
+ public function test_allow_indirect_properties() {
+ $actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+ array(
+ 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+ 'styles' => array(
+ 'blocks' => array(
+ 'core/social-links' => array(
+ 'spacing' => array(
+ 'blockGap' => array(
+ 'top' => '1em',
+ 'left' => '2em',
+ ),
+ ),
+ ),
+ ),
+ 'spacing' => array(
+ 'blockGap' => '3em',
+ ),
+ ),
+ )
+ );
+
+ $expected = array(
+ 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+ 'styles' => array(
+ 'blocks' => array(
+ 'core/social-links' => array(
+ 'spacing' => array(
+ 'blockGap' => array(
+ 'top' => '1em',
+ 'left' => '2em',
+ ),
+ ),
+ ),
+ ),
+ 'spacing' => array(
+ 'blockGap' => '3em',
+ ),
+ ),
+ );
+
+ $this->assertEqualSetsWithIndex( $expected, $actual );
+ }
+
public function test_remove_invalid_element_pseudo_selectors() {
$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
array(
@@ -1453,4 +1497,18 @@ public function test_update_separator_declarations() {
$this->assertEquals( $expected, $stylesheet );
}
+
+ public function test_get_stylesheet_handles_custom_css() {
+ $theme_json = new WP_Theme_JSON_Gutenberg(
+ array(
+ 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+ 'styles' => array(
+ 'css' => 'body { color:purple; }',
+ ),
+ )
+ );
+
+ $custom_css = 'body { color:purple; }';
+ $this->assertEquals( $custom_css, $theme_json->get_stylesheet( array( 'custom-css' ) ) );
+ }
}
diff --git a/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css b/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css
new file mode 100644
index 0000000000000..19abbecf86f4c
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css
@@ -0,0 +1,8 @@
+/*
+Theme Name: Block Theme Child Theme With Fluid Typography
+Theme URI: https://wordpress.org/
+Description: For testing purposes only.
+Template: block-theme
+Version: 1.0.0
+Text Domain: block-theme-child-with-fluid-typography
+*/
diff --git a/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json b/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json
new file mode 100644
index 0000000000000..d0ec32d9caac0
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json
@@ -0,0 +1,11 @@
+{
+ "version": 2,
+ "settings": {
+ "appearanceTools": true,
+ "typography": {
+ "fluid": {
+ "minFontSize": "16px"
+ }
+ }
+ }
+}
diff --git a/phpunit/style-engine/style-engine-test.php b/phpunit/style-engine/style-engine-test.php
index 66d8dd6286527..0588f10ef4fce 100644
--- a/phpunit/style-engine/style-engine-test.php
+++ b/phpunit/style-engine/style-engine-test.php
@@ -188,6 +188,7 @@ public function data_wp_style_engine_get_styles() {
'fontStyle' => 'italic',
'fontWeight' => '800',
'lineHeight' => '1.3',
+ 'textColumns' => '2',
'textDecoration' => 'underline',
'textTransform' => 'uppercase',
'letterSpacing' => '2',
@@ -195,13 +196,14 @@ public function data_wp_style_engine_get_styles() {
),
'options' => null,
'expected_output' => array(
- 'css' => 'font-size:clamp(2em, 2vw, 4em);font-family:Roboto,Oxygen-Sans,Ubuntu,sans-serif;font-style:italic;font-weight:800;line-height:1.3;text-decoration:underline;text-transform:uppercase;letter-spacing:2;',
+ 'css' => 'font-size:clamp(2em, 2vw, 4em);font-family:Roboto,Oxygen-Sans,Ubuntu,sans-serif;font-style:italic;font-weight:800;line-height:1.3;column-count:2;text-decoration:underline;text-transform:uppercase;letter-spacing:2;',
'declarations' => array(
'font-size' => 'clamp(2em, 2vw, 4em)',
'font-family' => 'Roboto,Oxygen-Sans,Ubuntu,sans-serif',
'font-style' => 'italic',
'font-weight' => '800',
'line-height' => '1.3',
+ 'column-count' => '2',
'text-decoration' => 'underline',
'text-transform' => 'uppercase',
'letter-spacing' => '2',
diff --git a/schemas/json/theme.json b/schemas/json/theme.json
index 1a8aa67b0967b..d734926219308 100644
--- a/schemas/json/theme.json
+++ b/schemas/json/theme.json
@@ -353,8 +353,23 @@
"default": true
},
"fluid": {
- "description": "Opts into fluid typography.",
- "type": "boolean"
+ "description": "Enables fluid typography and allows users to set global fluid typography parameters.",
+ "oneOf": [
+ {
+ "type": "object",
+ "properties": {
+ "minFontSize": {
+ "description": "Allow users to set a global minimum font size boundary in px, rem or em. Custom font sizes below this value will not be clamped, and all calculated minimum font sizes will be, a at minimum, this value.",
+ "type": "string"
+ }
+ },
+ "additionalProperties": false
+ },
+ {
+ "type": "boolean"
+ }
+ ],
+ "default": false
},
"letterSpacing": {
"description": "Allow users to set custom letter spacing.",
diff --git a/test/e2e/specs/editor/blocks/paragraph.spec.js b/test/e2e/specs/editor/blocks/paragraph.spec.js
index c713379569b90..19c386cce457d 100644
--- a/test/e2e/specs/editor/blocks/paragraph.spec.js
+++ b/test/e2e/specs/editor/blocks/paragraph.spec.js
@@ -195,8 +195,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( firstBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ firstBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -207,8 +211,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( firstBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ firstBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -219,8 +227,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( firstBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ firstBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -231,8 +243,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( firstBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ firstBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -309,8 +325,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( secondBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ secondBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -321,8 +341,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( secondBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ secondBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -333,8 +357,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( secondBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ secondBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -345,8 +373,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( secondBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ secondBlockBox
+ )
+ )
+ .toBeTruthy();
}
} );
@@ -387,8 +419,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( firstBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ firstBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -399,8 +435,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( firstBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ firstBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -411,8 +451,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( firstBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ firstBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -423,8 +467,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( secondBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ secondBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -435,8 +483,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( secondBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ secondBlockBox
+ )
+ )
+ .toBeTruthy();
}
{
@@ -447,8 +499,12 @@ test.describe( 'Paragraph', () => {
);
await expect( draggingUtils.dropZone ).toBeVisible();
await expect
- .poll( () => draggingUtils.dropZone.boundingBox() )
- .toEqual( secondBlockBox );
+ .poll( () =>
+ draggingUtils.confirmValidDropZonePosition(
+ secondBlockBox
+ )
+ )
+ .toBeTruthy();
}
} );
} );
@@ -508,4 +564,14 @@ class DraggingUtils {
await this.page.mouse.move( 0, 0 );
await this.page.mouse.down();
}
+
+ async confirmValidDropZonePosition( element ) {
+ // Check that both x and y axis of the dropzone
+ // have a less than 1 difference with a given target element
+ const box = await this.dropZone.boundingBox();
+ return (
+ Math.abs( element.x - box.x ) < 1 &&
+ Math.abs( element.y - box.y ) < 1
+ );
+ }
}
diff --git a/test/e2e/specs/editor/blocks/quote.spec.js b/test/e2e/specs/editor/blocks/quote.spec.js
index 69d69f0003489..299d56785d831 100644
--- a/test/e2e/specs/editor/blocks/quote.spec.js
+++ b/test/e2e/specs/editor/blocks/quote.spec.js
@@ -3,29 +3,317 @@
*/
const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
-test.describe( 'adding a quote', () => {
+test.describe( 'Quote', () => {
+ test.beforeEach( async ( { admin } ) => {
+ await admin.createNewPost();
+ } );
+
+ test.afterEach( async ( { requestUtils } ) => {
+ await requestUtils.deleteAllPosts();
+ } );
+
test( 'should allow the user to type right away', async ( {
- admin,
editor,
page,
} ) => {
- await admin.createNewPost();
+ await editor.insertBlock( { name: 'core/quote' } );
+ // Type content right after.
+ await page.keyboard.type( 'Quote content' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+Quote content
+
+`
+ );
+ } );
+
+ test( 'can be created by using > at the start of a paragraph block', async ( {
+ editor,
+ page,
+ } ) => {
+ // Create a block with some text that will trigger a paragraph creation.
+ await page.click( 'role=button[name="Add default block"i]' );
+ await page.keyboard.type( '> A quote' );
+ // Create a second paragraph.
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( 'Another paragraph' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+A quote
+
+
+
+Another paragraph
+
+`
+ );
+ } );
+
+ test( 'can be created by typing > in front of text of a paragraph block', async ( {
+ editor,
+ page,
+ pageUtils,
+ } ) => {
+ await page.click( 'role=button[name="Add default block"i]' );
+ await page.keyboard.type( 'test' );
+ await pageUtils.pressKeyTimes( 'ArrowLeft', 'test'.length );
+ await page.keyboard.type( '> ' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+test
+
+`
+ );
+ } );
+
+ test( 'can be created by typing "/quote"', async ( { editor, page } ) => {
+ // Create a list with the slash block shortcut.
+ await page.click( 'role=button[name="Add default block"i]' );
+ await page.keyboard.type( '/quote' );
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( 'I’m a quote' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+I’m a quote
+
+`
+ );
+ } );
+
+ test( 'can be created by converting a paragraph', async ( {
+ editor,
+ page,
+ } ) => {
+ await page.click( 'role=button[name="Add default block"i]' );
+ await page.keyboard.type( 'test' );
+ await editor.transformBlockTo( 'core/quote' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+test
+
+`
+ );
+ } );
+
+ test( 'can be created by converting multiple paragraphs', async ( {
+ editor,
+ page,
+ } ) => {
+ await page.click( 'role=button[name="Add default block"i]' );
+ await page.keyboard.type( 'one' );
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( 'two' );
+ await page.keyboard.down( 'Shift' );
+ await page.click(
+ 'role=document[name="Paragraph block"i] >> text=one'
+ );
+ await page.keyboard.up( 'Shift' );
+ await editor.transformBlockTo( 'core/quote' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+one
+
+
+
+two
+
+`
+ );
+ } );
- // Inserting a quote block
- await editor.insertBlock( {
- name: 'core/quote',
+ test.describe( 'can be converted to paragraphs', () => {
+ test( 'and renders one paragraph block per
within quote', async ( {
+ editor,
+ page,
+ } ) => {
+ await editor.insertBlock( { name: 'core/quote' } );
+ await page.keyboard.type( 'one' );
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( 'two' );
+ // Navigate to the citation to select the block.
+ await page.keyboard.press( 'ArrowRight' );
+ // Unwrap the block.
+ await editor.transformBlockTo( '*' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
one
+
+
+
+
two
+`
+ );
} );
- // Type content right after.
- await page.keyboard.type( 'Quote content' );
+ test( 'and renders a paragraph for the cite, if it exists', async ( {
+ editor,
+ page,
+ } ) => {
+ await editor.insertBlock( { name: 'core/quote' } );
+ await page.keyboard.type( 'one' );
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( 'two' );
+ await page.keyboard.press( 'ArrowRight' );
+ await page.keyboard.type( 'cite' );
+ // Unwrap the block.
+ await editor.transformBlockTo( '*' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
one
+
+
+
+
two
+
+
+
+
cite
+`
+ );
+ } );
+
+ test( 'and renders only one paragraph for the cite, if the quote is void', async ( {
+ editor,
+ page,
+ } ) => {
+ await editor.insertBlock( { name: 'core/quote' } );
+ await page.keyboard.press( 'ArrowRight' );
+ await page.keyboard.type( 'cite' );
+ // Unwrap the block.
+ await editor.transformBlockTo( '*' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+
- // Check the content
- const content = await editor.getEditedPostContent();
- expect( content ).toBe(
+
+
cite
+`
+ );
+ } );
+
+ test( 'and renders a void paragraph if both the cite and quote are void', async ( {
+ editor,
+ page,
+ } ) => {
+ await editor.insertBlock( { name: 'core/quote' } );
+ // Select the quote
+ await page.keyboard.press( 'ArrowRight' );
+ // Unwrap the block.
+ await editor.transformBlockTo( '*' );
+ expect( await editor.getEditedPostContent() ).toBe( '' );
+ } );
+ } );
+
+ test( 'can be created by converting a heading', async ( {
+ editor,
+ page,
+ } ) => {
+ await editor.insertBlock( { name: 'core/heading' } );
+ await page.keyboard.type( 'test' );
+ await editor.transformBlockTo( 'core/quote' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+test
+
+`
+ );
+ } );
+
+ test( 'can be converted to a pullquote', async ( { editor, page } ) => {
+ await editor.insertBlock( { name: 'core/quote' } );
+ await page.keyboard.type( 'one' );
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( 'two' );
+ await page.keyboard.press( 'ArrowRight' );
+ await page.keyboard.type( 'cite' );
+ await editor.transformBlockTo( 'core/pullquote' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
one
two
cite
+`
+ );
+ } );
+
+ test( 'can be split at the end', async ( { editor, page } ) => {
+ await editor.insertBlock( { name: 'core/quote' } );
+ await page.keyboard.type( '1' );
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.press( 'Enter' );
+ // Expect empty paragraph outside quote block.
+ expect( await editor.getEditedPostContent() ).toBe(
`
-Quote content
+1
+
+
+
+
+
+`
+ );
+ await page.keyboard.press( 'Backspace' );
+ await page.keyboard.type( '2' );
+ // Expect the paragraph to be merged into the quote block.
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+1
+
+
+
+2
+
+`
+ );
+ } );
+
+ test( 'can be unwrapped on Backspace', async ( { editor, page } ) => {
+ await editor.insertBlock( { name: 'core/quote' } );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+
+`
+ );
+ await page.keyboard.press( 'Backspace' );
+ expect( await editor.getEditedPostContent() ).toBe( '' );
+ } );
+
+ test( 'can be unwrapped with content on Backspace', async ( {
+ editor,
+ page,
+ pageUtils,
+ } ) => {
+ await editor.insertBlock( { name: 'core/quote' } );
+ await page.keyboard.type( '1' );
+ await page.keyboard.press( 'ArrowRight' );
+ await page.keyboard.type( '2' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
+1
+2
+`
+ );
+ // Move the cursor to the start of the first paragraph of the quoted block.
+ await pageUtils.pressKeyTimes( 'ArrowLeft', 4 );
+ await page.keyboard.press( 'Backspace' );
+ expect( await editor.getEditedPostContent() ).toBe(
+ `
+
1
+
+
+
+
2
`
);
} );
diff --git a/test/e2e/specs/editor/various/__snapshots__/Content-only-lock-should-be-able-to-edit-the-content-of-blocks-with-content-only-lock-1-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Content-only-lock-should-be-able-to-edit-the-content-of-blocks-with-content-only-lock-1-chromium.txt
new file mode 100644
index 0000000000000..18f0839c8dc89
--- /dev/null
+++ b/test/e2e/specs/editor/various/__snapshots__/Content-only-lock-should-be-able-to-edit-the-content-of-blocks-with-content-only-lock-1-chromium.txt
@@ -0,0 +1,5 @@
+
+
+
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/content-only-lock.spec.js b/test/e2e/specs/editor/various/content-only-lock.spec.js
new file mode 100644
index 0000000000000..41626ed986b8f
--- /dev/null
+++ b/test/e2e/specs/editor/various/content-only-lock.spec.js
@@ -0,0 +1,31 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Content-only lock', () => {
+ test.beforeEach( async ( { admin } ) => {
+ await admin.createNewPost();
+ } );
+
+ test( 'should be able to edit the content of blocks with content-only lock', async ( {
+ editor,
+ page,
+ pageUtils,
+ } ) => {
+ // Add content only locked block in the code editor
+ await pageUtils.pressKeyWithModifier( 'secondary', 'M' ); // Emulates CTRL+Shift+Alt + M => toggle code editor
+ await page.click( '.editor-post-text-editor' );
+ await page.keyboard
+ .type( `
+
+ ` );
+ await pageUtils.pressKeyWithModifier( 'secondary', 'M' );
+
+ await page.click( 'role=document[name="Paragraph block"i]' );
+ await page.keyboard.type( ' World' );
+ expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+ } );
+} );
diff --git a/test/e2e/specs/site-editor/push-to-global-styles.spec.js b/test/e2e/specs/site-editor/push-to-global-styles.spec.js
new file mode 100644
index 0000000000000..ce854f476e4f9
--- /dev/null
+++ b/test/e2e/specs/site-editor/push-to-global-styles.spec.js
@@ -0,0 +1,109 @@
+/**
+ * WordPress dependencies
+ */
+const {
+ test,
+ expect,
+ Editor,
+} = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.use( {
+ editor: async ( { page }, use ) => {
+ await use( new Editor( { page, hasIframe: true } ) );
+ },
+} );
+
+test.describe( 'Push to Global Styles button', () => {
+ test.beforeAll( async ( { requestUtils } ) => {
+ await Promise.all( [
+ requestUtils.activateTheme( 'emptytheme' ),
+ requestUtils.deleteAllTemplates( 'wp_template' ),
+ requestUtils.deleteAllTemplates( 'wp_template_part' ),
+ ] );
+ } );
+
+ test.afterAll( async ( { requestUtils } ) => {
+ await requestUtils.activateTheme( 'twentytwentyone' );
+ } );
+
+ test.beforeEach( async ( { admin, siteEditor } ) => {
+ await admin.visitSiteEditor();
+ await siteEditor.enterEditMode();
+ } );
+
+ test( 'should apply Heading block styles to all Heading blocks', async ( {
+ page,
+ editor,
+ } ) => {
+ // Add a Heading block.
+ await editor.insertBlock( { name: 'core/heading' } );
+ await page.keyboard.type( 'A heading' );
+
+ // Navigate to Styles -> Blocks -> Heading -> Typography
+ await page.getByRole( 'button', { name: 'Styles' } ).click();
+ await page.getByRole( 'button', { name: 'Blocks styles' } ).click();
+ await page
+ .getByRole( 'button', { name: 'Heading block styles' } )
+ .click();
+ await page.getByRole( 'button', { name: 'Typography styles' } ).click();
+
+ // Headings should not have uppercase
+ await expect(
+ page.getByRole( 'button', { name: 'Uppercase' } )
+ ).toHaveAttribute( 'aria-pressed', 'false' );
+
+ // Go to block settings and open the Advanced panel
+ await page.getByRole( 'button', { name: 'Settings' } ).click();
+ await page.getByRole( 'button', { name: 'Advanced' } ).click();
+
+ // Push button should be disabled
+ await expect(
+ page.getByRole( 'button', {
+ name: 'Push changes to Global Styles',
+ } )
+ ).toBeDisabled();
+
+ // Make the Heading block uppercase
+ await page.getByRole( 'button', { name: 'Uppercase' } ).click();
+
+ // Push button should now be enabled
+ await expect(
+ page.getByRole( 'button', {
+ name: 'Push changes to Global Styles',
+ } )
+ ).toBeEnabled();
+
+ // Press the Push button
+ await page
+ .getByRole( 'button', { name: 'Push changes to Global Styles' } )
+ .click();
+
+ // Snackbar notification should appear
+ await expect(
+ page.getByRole( 'button', {
+ name: 'Dismiss this notice',
+ text: 'Pushed styles to all Heading blocks.',
+ } )
+ ).toBeVisible();
+
+ // Push button should be disabled again
+ await expect(
+ page.getByRole( 'button', {
+ name: 'Push changes to Global Styles',
+ } )
+ ).toBeDisabled();
+
+ // Navigate again to Styles -> Blocks -> Heading -> Typography
+ await page.getByRole( 'button', { name: 'Styles' } ).click();
+ await page.getByRole( 'button', { name: 'Blocks styles' } ).click();
+ await page
+ .getByRole( 'button', { name: 'Heading block styles' } )
+ .click();
+ await page.getByRole( 'button', { name: 'Typography styles' } ).click();
+
+ // Headings should now have uppercase
+ await expect(
+ page.getByRole( 'button', { name: 'Uppercase' } )
+ ).toHaveAttribute( 'aria-pressed', 'true' );
+ } );
+} );
diff --git a/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.html b/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.html
new file mode 100644
index 0000000000000..e85e61b5d7b14
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.html
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.json b/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.json
new file mode 100644
index 0000000000000..82bc41a40fb1b
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.json
@@ -0,0 +1,72 @@
+[
+ {
+ "name": "core/query",
+ "isValid": true,
+ "attributes": {
+ "queryId": 19,
+ "query": {
+ "perPage": 3,
+ "pages": 0,
+ "offset": 0,
+ "postType": "post",
+ "order": "desc",
+ "orderBy": "date",
+ "author": "",
+ "search": "",
+ "exclude": [],
+ "sticky": "",
+ "inherit": false,
+ "taxQuery": {
+ "category": [ 3, 5 ],
+ "post_tag": [ 6 ]
+ }
+ },
+ "tagName": "div",
+ "displayLayout": {
+ "type": "list"
+ }
+ },
+ "innerBlocks": [
+ {
+ "name": "core/group",
+ "isValid": true,
+ "attributes": {
+ "tagName": "div",
+ "textColor": "pale-cyan-blue",
+ "style": {
+ "color": {
+ "background": "#284d5f"
+ },
+ "elements": {
+ "link": {
+ "color": {
+ "text": "var:preset|color|luminous-vivid-amber"
+ }
+ }
+ }
+ }
+ },
+ "innerBlocks": [
+ {
+ "name": "core/post-template",
+ "isValid": true,
+ "attributes": {},
+ "innerBlocks": [
+ {
+ "name": "core/post-title",
+ "isValid": true,
+ "attributes": {
+ "level": 2,
+ "isLink": false,
+ "rel": "",
+ "linkTarget": "_self"
+ },
+ "innerBlocks": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+]
diff --git a/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.parsed.json b/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.parsed.json
new file mode 100644
index 0000000000000..73e4f9b6c18f4
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.parsed.json
@@ -0,0 +1,59 @@
+[
+ {
+ "blockName": "core/query",
+ "attrs": {
+ "queryId": 19,
+ "query": {
+ "perPage": 3,
+ "pages": 0,
+ "offset": 0,
+ "postType": "post",
+ "categoryIds": [ 3, 5 ],
+ "tagIds": [ 6 ],
+ "order": "desc",
+ "orderBy": "date",
+ "author": "",
+ "search": "",
+ "exclude": [],
+ "sticky": "",
+ "inherit": false
+ },
+ "style": {
+ "color": {
+ "background": "#284d5f"
+ },
+ "elements": {
+ "link": {
+ "color": {
+ "text": "var:preset|color|luminous-vivid-amber"
+ }
+ }
+ }
+ },
+ "textColor": "pale-cyan-blue"
+ },
+ "innerBlocks": [
+ {
+ "blockName": "core/post-template",
+ "attrs": {},
+ "innerBlocks": [
+ {
+ "blockName": "core/post-title",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "",
+ "innerContent": []
+ }
+ ],
+ "innerHTML": "\n\n",
+ "innerContent": [ "\n", null, "\n" ]
+ }
+ ],
+ "innerHTML": "\n
\n
\n",
+ "innerContent": [
+ "\n
",
+ null,
+ "\n
\n"
+ ]
+ }
+]
diff --git a/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.serialized.html b/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.serialized.html
new file mode 100644
index 0000000000000..f86b4f26ecc1d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__query__deprecated-2-with-colors.serialized.html
@@ -0,0 +1,7 @@
+
+
+
diff --git a/test/integration/fixtures/blocks/core__query__deprecated-3.html b/test/integration/fixtures/blocks/core__query__deprecated-3.html
new file mode 100644
index 0000000000000..9da20c78184e2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__query__deprecated-3.html
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
No results found.
+
+
+
\ No newline at end of file
diff --git a/test/integration/fixtures/blocks/core__query__deprecated-3.json b/test/integration/fixtures/blocks/core__query__deprecated-3.json
new file mode 100644
index 0000000000000..bb1478cd676f2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__query__deprecated-3.json
@@ -0,0 +1,133 @@
+[
+ {
+ "name": "core/query",
+ "isValid": true,
+ "attributes": {
+ "queryId": 3,
+ "query": {
+ "perPage": 3,
+ "pages": 0,
+ "offset": 0,
+ "postType": "post",
+ "order": "desc",
+ "orderBy": "date",
+ "author": "",
+ "search": "",
+ "exclude": [],
+ "sticky": "",
+ "inherit": false
+ },
+ "tagName": "div",
+ "displayLayout": {
+ "type": "flex",
+ "columns": 3
+ },
+ "align": "wide"
+ },
+ "innerBlocks": [
+ {
+ "name": "core/group",
+ "isValid": true,
+ "attributes": {
+ "tagName": "div",
+ "textColor": "pale-cyan-blue",
+ "style": {
+ "color": {
+ "background": "#284d5f"
+ },
+ "elements": {
+ "link": {
+ "color": {
+ "text": "var:preset|color|luminous-vivid-amber"
+ }
+ }
+ }
+ }
+ },
+ "innerBlocks": [
+ {
+ "name": "core/post-template",
+ "isValid": true,
+ "attributes": {
+ "fontSize": "large"
+ },
+ "innerBlocks": [
+ {
+ "name": "core/post-title",
+ "isValid": true,
+ "attributes": {
+ "level": 2,
+ "isLink": false,
+ "rel": "",
+ "linkTarget": "_self"
+ },
+ "innerBlocks": []
+ },
+ {
+ "name": "core/post-date",
+ "isValid": true,
+ "attributes": {
+ "isLink": false,
+ "displayType": "date"
+ },
+ "innerBlocks": []
+ },
+ {
+ "name": "core/post-excerpt",
+ "isValid": true,
+ "attributes": {
+ "showMoreOnNewLine": true
+ },
+ "innerBlocks": []
+ }
+ ]
+ },
+ {
+ "name": "core/query-pagination",
+ "isValid": true,
+ "attributes": {
+ "paginationArrow": "none"
+ },
+ "innerBlocks": [
+ {
+ "name": "core/query-pagination-previous",
+ "isValid": true,
+ "attributes": {},
+ "innerBlocks": []
+ },
+ {
+ "name": "core/query-pagination-numbers",
+ "isValid": true,
+ "attributes": {},
+ "innerBlocks": []
+ },
+ {
+ "name": "core/query-pagination-next",
+ "isValid": true,
+ "attributes": {},
+ "innerBlocks": []
+ }
+ ]
+ },
+ {
+ "name": "core/query-no-results",
+ "isValid": true,
+ "attributes": {},
+ "innerBlocks": [
+ {
+ "name": "core/paragraph",
+ "isValid": true,
+ "attributes": {
+ "content": "No results found.",
+ "dropCap": false,
+ "placeholder": "Add text or blocks that will display when a query returns no results."
+ },
+ "innerBlocks": []
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+]
diff --git a/test/integration/fixtures/blocks/core__query__deprecated-3.parsed.json b/test/integration/fixtures/blocks/core__query__deprecated-3.parsed.json
new file mode 100644
index 0000000000000..a26e573bac314
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__query__deprecated-3.parsed.json
@@ -0,0 +1,128 @@
+[
+ {
+ "blockName": "core/query",
+ "attrs": {
+ "queryId": 3,
+ "query": {
+ "perPage": 3,
+ "pages": 0,
+ "offset": 0,
+ "postType": "post",
+ "order": "desc",
+ "orderBy": "date",
+ "author": "",
+ "search": "",
+ "exclude": [],
+ "sticky": "",
+ "inherit": false
+ },
+ "displayLayout": {
+ "type": "flex",
+ "columns": 3
+ },
+ "align": "wide",
+ "style": {
+ "color": {
+ "background": "#284d5f"
+ },
+ "elements": {
+ "link": {
+ "color": {
+ "text": "var:preset|color|luminous-vivid-amber"
+ }
+ }
+ }
+ },
+ "textColor": "pale-cyan-blue"
+ },
+ "innerBlocks": [
+ {
+ "blockName": "core/post-template",
+ "attrs": {
+ "fontSize": "large"
+ },
+ "innerBlocks": [
+ {
+ "blockName": "core/post-title",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "",
+ "innerContent": []
+ },
+ {
+ "blockName": "core/post-date",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "",
+ "innerContent": []
+ },
+ {
+ "blockName": "core/post-excerpt",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "",
+ "innerContent": []
+ }
+ ],
+ "innerHTML": "\n\n\n\n\n\n",
+ "innerContent": [ "\n", null, "\n\n", null, "\n\n", null, "\n" ]
+ },
+ {
+ "blockName": "core/query-pagination",
+ "attrs": {},
+ "innerBlocks": [
+ {
+ "blockName": "core/query-pagination-previous",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "",
+ "innerContent": []
+ },
+ {
+ "blockName": "core/query-pagination-numbers",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "",
+ "innerContent": []
+ },
+ {
+ "blockName": "core/query-pagination-next",
+ "attrs": {},
+ "innerBlocks": [],
+ "innerHTML": "",
+ "innerContent": []
+ }
+ ],
+ "innerHTML": "\n\n\n\n\n\n",
+ "innerContent": [ "\n", null, "\n\n", null, "\n\n", null, "\n" ]
+ },
+ {
+ "blockName": "core/query-no-results",
+ "attrs": {},
+ "innerBlocks": [
+ {
+ "blockName": "core/paragraph",
+ "attrs": {
+ "placeholder": "Add text or blocks that will display when a query returns no results."
+ },
+ "innerBlocks": [],
+ "innerHTML": "\n
No results found.
\n",
+ "innerContent": [ "\n
No results found.
\n" ]
+ }
+ ],
+ "innerHTML": "\n\n",
+ "innerContent": [ "\n", null, "\n" ]
+ }
+ ],
+ "innerHTML": "\n
\n\n\n\n
\n",
+ "innerContent": [
+ "\n
",
+ null,
+ "\n\n",
+ null,
+ "\n\n",
+ null,
+ "
\n"
+ ]
+ }
+]
diff --git a/test/integration/fixtures/blocks/core__query__deprecated-3.serialized.html b/test/integration/fixtures/blocks/core__query__deprecated-3.serialized.html
new file mode 100644
index 0000000000000..edbf5b1a0557b
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__query__deprecated-3.serialized.html
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
No results found.
+
+
+
+