Minor
', array( 'HTML', 'BODY', 'H2', 'SPAN', 'H4' ), 1 ), 'H5 after unclosed H4 inside H2' => array( 'MajorMinor
', array( 'HTML', 'BODY', 'H2', 'SPAN', 'H5' ), 1 ),
'H5 after H4 inside H2' => array( 'MajorMinor
', array( 'HTML', 'BODY', 'H5' ), 1 ),
+
+ // Custom elements.
+ 'WP-EMOJI' => array( '![]()
', array( 'HTML', 'BODY', 'DIV', 'IMG' ), 1 ),
);
}
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php b/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
index 7bd243d8dce9a..bd3996d51d7b7 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
@@ -35,7 +35,7 @@ public function test_in_body_article_group_closes_open_p_element( $tag_name ) {
continue;
}
- $this->assertEquals(
+ $this->assertSame(
$tag_name,
$processor->get_tag(),
"Expected to find {$tag_name} but found {$processor->get_tag()} instead."
@@ -125,7 +125,7 @@ public function test_in_body_skips_unexpected_button_closer() {
$p = WP_HTML_Processor::create_fragment( 'Test' );
$p->step();
- $this->assertEquals( 'DIV', $p->get_tag(), 'Did not stop at initial DIV tag.' );
+ $this->assertSame( 'DIV', $p->get_tag(), 'Did not stop at initial DIV tag.' );
$this->assertFalse( $p->is_tag_closer(), 'Did not find that initial DIV tag is an opener.' );
/*
@@ -133,7 +133,7 @@ public function test_in_body_skips_unexpected_button_closer() {
* It should be ignored as there's no BUTTON to close.
*/
$this->assertTrue( $p->step(), 'Found no further tags when it should have found the closing DIV' );
- $this->assertEquals( 'DIV', $p->get_tag(), "Did not skip unexpected BUTTON; stopped at {$p->get_tag()}." );
+ $this->assertSame( 'DIV', $p->get_tag(), "Did not skip unexpected BUTTON; stopped at {$p->get_tag()}." );
$this->assertTrue( $p->is_tag_closer(), 'Did not find that the terminal DIV tag is a closer.' );
}
diff --git a/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
index 9dbb689df0329..a0c9c600c1e45 100644
--- a/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
+++ b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
@@ -72,21 +72,16 @@ public function test_has_element_in_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -115,21 +110,16 @@ public function test_has_element_in_list_item_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
// These elements are specific to list item scope.
$this->ensure_support_is_added_everywhere( 'OL' );
@@ -161,21 +151,16 @@ public function test_has_element_in_button_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -201,21 +186,16 @@ public function test_after_element_pop_must_maintain_p_in_button_scope_flag() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -241,21 +221,16 @@ public function test_after_element_push_must_maintain_p_in_button_scope_flag() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -280,21 +255,16 @@ public function test_has_element_in_table_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
// These elements are specific to TABLE scope.
$this->ensure_support_is_added_everywhere( 'HTML' );
@@ -335,21 +305,16 @@ public function test_has_element_in_select_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
// These elements are specific to SELECT scope.
$this->ensure_support_is_added_everywhere( 'OPTGROUP' );
diff --git a/tests/phpunit/tests/post.php b/tests/phpunit/tests/post.php
index 548c5eb2cabf8..6e0207add28de 100644
--- a/tests/phpunit/tests/post.php
+++ b/tests/phpunit/tests/post.php
@@ -329,12 +329,12 @@ public function test_user_without_publish_posts_cannot_affect_sticky() {
);
stick_post( $post->ID );
- // Sanity check.
+ // Confidence check.
$this->assertTrue( is_sticky( $post->ID ) );
wp_set_current_user( self::$grammarian_id );
- // Sanity check.
+ // Confidence check.
$this->assertFalse( current_user_can( 'publish_posts' ) );
$this->assertTrue( current_user_can( 'edit_others_posts' ) );
$this->assertTrue( current_user_can( 'edit_published_posts' ) );
@@ -367,12 +367,12 @@ public function test_user_without_publish_posts_cannot_affect_sticky_with_edit_p
);
stick_post( $post->ID );
- // Sanity check.
+ // Confidence check.
$this->assertTrue( is_sticky( $post->ID ) );
wp_set_current_user( self::$grammarian_id );
- // Sanity check.
+ // Confidence check.
$this->assertFalse( current_user_can( 'publish_posts' ) );
$this->assertTrue( current_user_can( 'edit_others_posts' ) );
$this->assertTrue( current_user_can( 'edit_published_posts' ) );
diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php
index ac5b0741e90a0..2cad1ef03225f 100644
--- a/tests/phpunit/tests/rest-api/rest-users-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-users-controller.php
@@ -2520,7 +2520,7 @@ public function test_delete_user_reassign() {
)
);
- // Sanity check to ensure the factory created the post correctly.
+ // Confidence check to ensure the factory created the post correctly.
$post = get_post( $test_post );
$this->assertEquals( $user_id, $post->post_author );
diff --git a/tests/phpunit/tests/style-engine/styleEngine.php b/tests/phpunit/tests/style-engine/styleEngine.php
index b1a01563c2097..b208e4ef0575a 100644
--- a/tests/phpunit/tests/style-engine/styleEngine.php
+++ b/tests/phpunit/tests/style-engine/styleEngine.php
@@ -27,6 +27,7 @@ public function tear_down() {
* @ticket 56467
* @ticket 58549
* @ticket 58590
+ * @ticket 60175
*
* @covers ::wp_style_engine_get_styles
*
@@ -252,19 +253,26 @@ public function data_wp_style_engine_get_styles() {
'elements_with_css_var_value' => array(
'block_styles' => array(
- 'color' => array(
+ 'color' => array(
'text' => 'var:preset|color|my-little-pony',
),
+ 'typography' => array(
+ 'fontSize' => 'var:preset|font-size|cabbage-patch',
+ 'fontFamily' => 'var:preset|font-family|transformers',
+ ),
),
'options' => array(
'selector' => '.wp-selector',
),
'expected_output' => array(
- 'css' => '.wp-selector{color:var(--wp--preset--color--my-little-pony);}',
+ 'css' => '.wp-selector{color:var(--wp--preset--color--my-little-pony);font-size:var(--wp--preset--font-size--cabbage-patch);font-family:var(--wp--preset--font-family--transformers);}',
'declarations' => array(
- 'color' => 'var(--wp--preset--color--my-little-pony)',
+ 'color' => 'var(--wp--preset--color--my-little-pony)',
+ 'font-size' => 'var(--wp--preset--font-size--cabbage-patch)',
+ 'font-family' => 'var(--wp--preset--font-family--transformers)',
+
),
- 'classnames' => 'has-text-color has-my-little-pony-color',
+ 'classnames' => 'has-text-color has-my-little-pony-color has-cabbage-patch-font-size has-transformers-font-family',
),
),
@@ -513,18 +521,22 @@ public function data_wp_style_engine_get_styles() {
'inline_background_image_url_with_background_size' => array(
'block_styles' => array(
'background' => array(
- 'backgroundImage' => array(
+ 'backgroundImage' => array(
'url' => 'https://example.com/image.jpg',
),
- 'backgroundSize' => 'cover',
+ 'backgroundPosition' => 'center',
+ 'backgroundRepeat' => 'no-repeat',
+ 'backgroundSize' => 'cover',
),
),
'options' => array(),
'expected_output' => array(
- 'css' => "background-image:url('https://example.com/image.jpg');background-size:cover;",
+ 'css' => "background-image:url('https://example.com/image.jpg');background-position:center;background-repeat:no-repeat;background-size:cover;",
'declarations' => array(
- 'background-image' => "url('https://example.com/image.jpg')",
- 'background-size' => 'cover',
+ 'background-image' => "url('https://example.com/image.jpg')",
+ 'background-position' => 'center',
+ 'background-repeat' => 'no-repeat',
+ 'background-size' => 'cover',
),
),
),
diff --git a/tests/phpunit/tests/term/wpInsertTerm.php b/tests/phpunit/tests/term/wpInsertTerm.php
index d99593b1d5f2e..798db9233bfc8 100644
--- a/tests/phpunit/tests/term/wpInsertTerm.php
+++ b/tests/phpunit/tests/term/wpInsertTerm.php
@@ -895,6 +895,19 @@ public function test_wp_insert_term_with_null_description() {
$this->assertSame( '', $term_object->description );
}
+ /**
+ * @ticket 59995
+ */
+ public function test_wp_insert_term_with_empty_name_after_db_sanitization() {
+ $term = wp_insert_term(
+ '',
+ 'post_tag'
+ );
+
+ $this->assertWPError( $term );
+ $this->assertSame( 'invalid_term_name', $term->get_error_code() );
+ }
+
/** Helpers */
public function deleted_term_cb( $term, $tt_id, $taxonomy, $deleted_term, $object_ids ) {
diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php
index cf5ea9ad6c208..a70bf9e7ff60a 100644
--- a/tests/phpunit/tests/theme.php
+++ b/tests/phpunit/tests/theme.php
@@ -1259,8 +1259,8 @@ function () use ( $new_root ) {
// Cleanup.
switch_theme( $old_theme->get_stylesheet() );
- $this->assertEquals( $old_root . '/test', $path1, 'The original stylesheet path is not correct' );
- $this->assertEquals( $new_root . '/test', $path2, 'The new stylesheet path is not correct' );
+ $this->assertSame( $old_root . '/test', $path1, 'The original stylesheet path is not correct' );
+ $this->assertSame( $new_root . '/test', $path2, 'The new stylesheet path is not correct' );
}
/**
@@ -1302,7 +1302,7 @@ function () use ( $new_root ) {
// Cleanup.
switch_theme( $old_theme->get_stylesheet() );
- $this->assertEquals( $old_root . '/test-parent', $path1, 'The original template path is not correct' );
- $this->assertEquals( $new_root . '/test-parent', $path2, 'The new template path is not correct' );
+ $this->assertSame( $old_root . '/test-parent', $path1, 'The original template path is not correct' );
+ $this->assertSame( $new_root . '/test-parent', $path2, 'The new template path is not correct' );
}
}
diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php
index 6da723583ba45..49e1661844b10 100644
--- a/tests/phpunit/tests/theme/wpThemeJson.php
+++ b/tests/phpunit/tests/theme/wpThemeJson.php
@@ -264,6 +264,7 @@ public function test_get_settings_appearance_true_opts_in() {
$expected = array(
'background' => array(
'backgroundImage' => true,
+ 'backgroundSize' => true,
),
'border' => array(
'width' => true,
@@ -300,6 +301,7 @@ public function test_get_settings_appearance_true_opts_in() {
'core/group' => array(
'background' => array(
'backgroundImage' => true,
+ 'backgroundSize' => true,
),
'border' => array(
'width' => true,
diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
index cc7cfa2f65238..dd5fff2bff8ef 100644
--- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php
+++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
@@ -433,6 +433,9 @@ public function data_get_core_data() {
/**
* @ticket 54336
+ * @ticket 60118
+ *
+ * @covers ::add_theme_support
*/
public function test_add_theme_supports_are_loaded_for_themes_without_theme_json() {
switch_theme( 'default' );
@@ -455,15 +458,18 @@ public function test_add_theme_supports_are_loaded_for_themes_without_theme_json
);
add_theme_support( 'editor-color-palette', $color_palette );
add_theme_support( 'custom-line-height' );
+ add_theme_support( 'appearance-tools' );
$settings = WP_Theme_JSON_Resolver::get_theme_data()->get_settings();
remove_theme_support( 'custom-line-height' );
remove_theme_support( 'editor-color-palette' );
+ remove_theme_support( 'appearance-tools' );
$this->assertFalse( wp_theme_has_theme_json() );
$this->assertTrue( $settings['typography']['lineHeight'] );
$this->assertSame( $color_palette, $settings['color']['palette']['theme'] );
+ $this->assertTrue( $settings['border']['color'], 'Support for "appearance-tools" was not added.' );
}
/**
MajorMinor
', array( 'HTML', 'BODY', 'H5' ), 1 ),
+
+ // Custom elements.
+ 'WP-EMOJI' => array( '![]()
', array( 'HTML', 'BODY', 'DIV', 'IMG' ), 1 ),
);
}
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php b/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
index 7bd243d8dce9a..bd3996d51d7b7 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
@@ -35,7 +35,7 @@ public function test_in_body_article_group_closes_open_p_element( $tag_name ) {
continue;
}
- $this->assertEquals(
+ $this->assertSame(
$tag_name,
$processor->get_tag(),
"Expected to find {$tag_name} but found {$processor->get_tag()} instead."
@@ -125,7 +125,7 @@ public function test_in_body_skips_unexpected_button_closer() {
$p = WP_HTML_Processor::create_fragment( 'Test' );
$p->step();
- $this->assertEquals( 'DIV', $p->get_tag(), 'Did not stop at initial DIV tag.' );
+ $this->assertSame( 'DIV', $p->get_tag(), 'Did not stop at initial DIV tag.' );
$this->assertFalse( $p->is_tag_closer(), 'Did not find that initial DIV tag is an opener.' );
/*
@@ -133,7 +133,7 @@ public function test_in_body_skips_unexpected_button_closer() {
* It should be ignored as there's no BUTTON to close.
*/
$this->assertTrue( $p->step(), 'Found no further tags when it should have found the closing DIV' );
- $this->assertEquals( 'DIV', $p->get_tag(), "Did not skip unexpected BUTTON; stopped at {$p->get_tag()}." );
+ $this->assertSame( 'DIV', $p->get_tag(), "Did not skip unexpected BUTTON; stopped at {$p->get_tag()}." );
$this->assertTrue( $p->is_tag_closer(), 'Did not find that the terminal DIV tag is a closer.' );
}
diff --git a/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
index 9dbb689df0329..a0c9c600c1e45 100644
--- a/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
+++ b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
@@ -72,21 +72,16 @@ public function test_has_element_in_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -115,21 +110,16 @@ public function test_has_element_in_list_item_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
// These elements are specific to list item scope.
$this->ensure_support_is_added_everywhere( 'OL' );
@@ -161,21 +151,16 @@ public function test_has_element_in_button_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -201,21 +186,16 @@ public function test_after_element_pop_must_maintain_p_in_button_scope_flag() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -241,21 +221,16 @@ public function test_after_element_push_must_maintain_p_in_button_scope_flag() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -280,21 +255,16 @@ public function test_has_element_in_table_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
// These elements are specific to TABLE scope.
$this->ensure_support_is_added_everywhere( 'HTML' );
@@ -335,21 +305,16 @@ public function test_has_element_in_select_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
// These elements are specific to SELECT scope.
$this->ensure_support_is_added_everywhere( 'OPTGROUP' );
diff --git a/tests/phpunit/tests/post.php b/tests/phpunit/tests/post.php
index 548c5eb2cabf8..6e0207add28de 100644
--- a/tests/phpunit/tests/post.php
+++ b/tests/phpunit/tests/post.php
@@ -329,12 +329,12 @@ public function test_user_without_publish_posts_cannot_affect_sticky() {
);
stick_post( $post->ID );
- // Sanity check.
+ // Confidence check.
$this->assertTrue( is_sticky( $post->ID ) );
wp_set_current_user( self::$grammarian_id );
- // Sanity check.
+ // Confidence check.
$this->assertFalse( current_user_can( 'publish_posts' ) );
$this->assertTrue( current_user_can( 'edit_others_posts' ) );
$this->assertTrue( current_user_can( 'edit_published_posts' ) );
@@ -367,12 +367,12 @@ public function test_user_without_publish_posts_cannot_affect_sticky_with_edit_p
);
stick_post( $post->ID );
- // Sanity check.
+ // Confidence check.
$this->assertTrue( is_sticky( $post->ID ) );
wp_set_current_user( self::$grammarian_id );
- // Sanity check.
+ // Confidence check.
$this->assertFalse( current_user_can( 'publish_posts' ) );
$this->assertTrue( current_user_can( 'edit_others_posts' ) );
$this->assertTrue( current_user_can( 'edit_published_posts' ) );
diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php
index ac5b0741e90a0..2cad1ef03225f 100644
--- a/tests/phpunit/tests/rest-api/rest-users-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-users-controller.php
@@ -2520,7 +2520,7 @@ public function test_delete_user_reassign() {
)
);
- // Sanity check to ensure the factory created the post correctly.
+ // Confidence check to ensure the factory created the post correctly.
$post = get_post( $test_post );
$this->assertEquals( $user_id, $post->post_author );
diff --git a/tests/phpunit/tests/style-engine/styleEngine.php b/tests/phpunit/tests/style-engine/styleEngine.php
index b1a01563c2097..b208e4ef0575a 100644
--- a/tests/phpunit/tests/style-engine/styleEngine.php
+++ b/tests/phpunit/tests/style-engine/styleEngine.php
@@ -27,6 +27,7 @@ public function tear_down() {
* @ticket 56467
* @ticket 58549
* @ticket 58590
+ * @ticket 60175
*
* @covers ::wp_style_engine_get_styles
*
@@ -252,19 +253,26 @@ public function data_wp_style_engine_get_styles() {
'elements_with_css_var_value' => array(
'block_styles' => array(
- 'color' => array(
+ 'color' => array(
'text' => 'var:preset|color|my-little-pony',
),
+ 'typography' => array(
+ 'fontSize' => 'var:preset|font-size|cabbage-patch',
+ 'fontFamily' => 'var:preset|font-family|transformers',
+ ),
),
'options' => array(
'selector' => '.wp-selector',
),
'expected_output' => array(
- 'css' => '.wp-selector{color:var(--wp--preset--color--my-little-pony);}',
+ 'css' => '.wp-selector{color:var(--wp--preset--color--my-little-pony);font-size:var(--wp--preset--font-size--cabbage-patch);font-family:var(--wp--preset--font-family--transformers);}',
'declarations' => array(
- 'color' => 'var(--wp--preset--color--my-little-pony)',
+ 'color' => 'var(--wp--preset--color--my-little-pony)',
+ 'font-size' => 'var(--wp--preset--font-size--cabbage-patch)',
+ 'font-family' => 'var(--wp--preset--font-family--transformers)',
+
),
- 'classnames' => 'has-text-color has-my-little-pony-color',
+ 'classnames' => 'has-text-color has-my-little-pony-color has-cabbage-patch-font-size has-transformers-font-family',
),
),
@@ -513,18 +521,22 @@ public function data_wp_style_engine_get_styles() {
'inline_background_image_url_with_background_size' => array(
'block_styles' => array(
'background' => array(
- 'backgroundImage' => array(
+ 'backgroundImage' => array(
'url' => 'https://example.com/image.jpg',
),
- 'backgroundSize' => 'cover',
+ 'backgroundPosition' => 'center',
+ 'backgroundRepeat' => 'no-repeat',
+ 'backgroundSize' => 'cover',
),
),
'options' => array(),
'expected_output' => array(
- 'css' => "background-image:url('https://example.com/image.jpg');background-size:cover;",
+ 'css' => "background-image:url('https://example.com/image.jpg');background-position:center;background-repeat:no-repeat;background-size:cover;",
'declarations' => array(
- 'background-image' => "url('https://example.com/image.jpg')",
- 'background-size' => 'cover',
+ 'background-image' => "url('https://example.com/image.jpg')",
+ 'background-position' => 'center',
+ 'background-repeat' => 'no-repeat',
+ 'background-size' => 'cover',
),
),
),
diff --git a/tests/phpunit/tests/term/wpInsertTerm.php b/tests/phpunit/tests/term/wpInsertTerm.php
index d99593b1d5f2e..798db9233bfc8 100644
--- a/tests/phpunit/tests/term/wpInsertTerm.php
+++ b/tests/phpunit/tests/term/wpInsertTerm.php
@@ -895,6 +895,19 @@ public function test_wp_insert_term_with_null_description() {
$this->assertSame( '', $term_object->description );
}
+ /**
+ * @ticket 59995
+ */
+ public function test_wp_insert_term_with_empty_name_after_db_sanitization() {
+ $term = wp_insert_term(
+ '',
+ 'post_tag'
+ );
+
+ $this->assertWPError( $term );
+ $this->assertSame( 'invalid_term_name', $term->get_error_code() );
+ }
+
/** Helpers */
public function deleted_term_cb( $term, $tt_id, $taxonomy, $deleted_term, $object_ids ) {
diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php
index cf5ea9ad6c208..a70bf9e7ff60a 100644
--- a/tests/phpunit/tests/theme.php
+++ b/tests/phpunit/tests/theme.php
@@ -1259,8 +1259,8 @@ function () use ( $new_root ) {
// Cleanup.
switch_theme( $old_theme->get_stylesheet() );
- $this->assertEquals( $old_root . '/test', $path1, 'The original stylesheet path is not correct' );
- $this->assertEquals( $new_root . '/test', $path2, 'The new stylesheet path is not correct' );
+ $this->assertSame( $old_root . '/test', $path1, 'The original stylesheet path is not correct' );
+ $this->assertSame( $new_root . '/test', $path2, 'The new stylesheet path is not correct' );
}
/**
@@ -1302,7 +1302,7 @@ function () use ( $new_root ) {
// Cleanup.
switch_theme( $old_theme->get_stylesheet() );
- $this->assertEquals( $old_root . '/test-parent', $path1, 'The original template path is not correct' );
- $this->assertEquals( $new_root . '/test-parent', $path2, 'The new template path is not correct' );
+ $this->assertSame( $old_root . '/test-parent', $path1, 'The original template path is not correct' );
+ $this->assertSame( $new_root . '/test-parent', $path2, 'The new template path is not correct' );
}
}
diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php
index 6da723583ba45..49e1661844b10 100644
--- a/tests/phpunit/tests/theme/wpThemeJson.php
+++ b/tests/phpunit/tests/theme/wpThemeJson.php
@@ -264,6 +264,7 @@ public function test_get_settings_appearance_true_opts_in() {
$expected = array(
'background' => array(
'backgroundImage' => true,
+ 'backgroundSize' => true,
),
'border' => array(
'width' => true,
@@ -300,6 +301,7 @@ public function test_get_settings_appearance_true_opts_in() {
'core/group' => array(
'background' => array(
'backgroundImage' => true,
+ 'backgroundSize' => true,
),
'border' => array(
'width' => true,
diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
index cc7cfa2f65238..dd5fff2bff8ef 100644
--- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php
+++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
@@ -433,6 +433,9 @@ public function data_get_core_data() {
/**
* @ticket 54336
+ * @ticket 60118
+ *
+ * @covers ::add_theme_support
*/
public function test_add_theme_supports_are_loaded_for_themes_without_theme_json() {
switch_theme( 'default' );
@@ -455,15 +458,18 @@ public function test_add_theme_supports_are_loaded_for_themes_without_theme_json
);
add_theme_support( 'editor-color-palette', $color_palette );
add_theme_support( 'custom-line-height' );
+ add_theme_support( 'appearance-tools' );
$settings = WP_Theme_JSON_Resolver::get_theme_data()->get_settings();
remove_theme_support( 'custom-line-height' );
remove_theme_support( 'editor-color-palette' );
+ remove_theme_support( 'appearance-tools' );
$this->assertFalse( wp_theme_has_theme_json() );
$this->assertTrue( $settings['typography']['lineHeight'] );
$this->assertSame( $color_palette, $settings['color']['palette']['theme'] );
+ $this->assertTrue( $settings['border']['color'], 'Support for "appearance-tools" was not added.' );
}
/**
Test
' );
$p->step();
- $this->assertEquals( 'DIV', $p->get_tag(), 'Did not stop at initial DIV tag.' );
+ $this->assertSame( 'DIV', $p->get_tag(), 'Did not stop at initial DIV tag.' );
$this->assertFalse( $p->is_tag_closer(), 'Did not find that initial DIV tag is an opener.' );
/*
@@ -133,7 +133,7 @@ public function test_in_body_skips_unexpected_button_closer() {
* It should be ignored as there's no BUTTON to close.
*/
$this->assertTrue( $p->step(), 'Found no further tags when it should have found the closing DIV' );
- $this->assertEquals( 'DIV', $p->get_tag(), "Did not skip unexpected BUTTON; stopped at {$p->get_tag()}." );
+ $this->assertSame( 'DIV', $p->get_tag(), "Did not skip unexpected BUTTON; stopped at {$p->get_tag()}." );
$this->assertTrue( $p->is_tag_closer(), 'Did not find that the terminal DIV tag is a closer.' );
}
diff --git a/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
index 9dbb689df0329..a0c9c600c1e45 100644
--- a/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
+++ b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
@@ -72,21 +72,16 @@ public function test_has_element_in_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -115,21 +110,16 @@ public function test_has_element_in_list_item_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
// These elements are specific to list item scope.
$this->ensure_support_is_added_everywhere( 'OL' );
@@ -161,21 +151,16 @@ public function test_has_element_in_button_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -201,21 +186,16 @@ public function test_after_element_pop_must_maintain_p_in_button_scope_flag() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -241,21 +221,16 @@ public function test_after_element_push_must_maintain_p_in_button_scope_flag() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
}
/**
@@ -280,21 +255,16 @@ public function test_has_element_in_table_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
// These elements are specific to TABLE scope.
$this->ensure_support_is_added_everywhere( 'HTML' );
@@ -335,21 +305,16 @@ public function test_has_element_in_select_scope_needs_support() {
$this->ensure_support_is_added_everywhere( 'OBJECT' );
$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
- // MathML Elements
- $this->ensure_support_is_added_everywhere( 'MI' );
- $this->ensure_support_is_added_everywhere( 'MO' );
- $this->ensure_support_is_added_everywhere( 'MN' );
- $this->ensure_support_is_added_everywhere( 'MS' );
- $this->ensure_support_is_added_everywhere( 'MTEXT' );
- $this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+ // MathML Elements: MI, MO, MN, MS, MTEXT, ANNOTATION-XML.
+ $this->ensure_support_is_added_everywhere( 'MATH' );
/*
* SVG elements: note that TITLE is both an HTML element and an SVG element
* so care must be taken when adding support for either one.
+ *
+ * FOREIGNOBJECT, DESC, TITLE.
*/
- $this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
- $this->ensure_support_is_added_everywhere( 'DESC' );
- $this->ensure_support_is_added_everywhere( 'TITLE' );
+ $this->ensure_support_is_added_everywhere( 'SVG' );
// These elements are specific to SELECT scope.
$this->ensure_support_is_added_everywhere( 'OPTGROUP' );
diff --git a/tests/phpunit/tests/post.php b/tests/phpunit/tests/post.php
index 548c5eb2cabf8..6e0207add28de 100644
--- a/tests/phpunit/tests/post.php
+++ b/tests/phpunit/tests/post.php
@@ -329,12 +329,12 @@ public function test_user_without_publish_posts_cannot_affect_sticky() {
);
stick_post( $post->ID );
- // Sanity check.
+ // Confidence check.
$this->assertTrue( is_sticky( $post->ID ) );
wp_set_current_user( self::$grammarian_id );
- // Sanity check.
+ // Confidence check.
$this->assertFalse( current_user_can( 'publish_posts' ) );
$this->assertTrue( current_user_can( 'edit_others_posts' ) );
$this->assertTrue( current_user_can( 'edit_published_posts' ) );
@@ -367,12 +367,12 @@ public function test_user_without_publish_posts_cannot_affect_sticky_with_edit_p
);
stick_post( $post->ID );
- // Sanity check.
+ // Confidence check.
$this->assertTrue( is_sticky( $post->ID ) );
wp_set_current_user( self::$grammarian_id );
- // Sanity check.
+ // Confidence check.
$this->assertFalse( current_user_can( 'publish_posts' ) );
$this->assertTrue( current_user_can( 'edit_others_posts' ) );
$this->assertTrue( current_user_can( 'edit_published_posts' ) );
diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php
index ac5b0741e90a0..2cad1ef03225f 100644
--- a/tests/phpunit/tests/rest-api/rest-users-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-users-controller.php
@@ -2520,7 +2520,7 @@ public function test_delete_user_reassign() {
)
);
- // Sanity check to ensure the factory created the post correctly.
+ // Confidence check to ensure the factory created the post correctly.
$post = get_post( $test_post );
$this->assertEquals( $user_id, $post->post_author );
diff --git a/tests/phpunit/tests/style-engine/styleEngine.php b/tests/phpunit/tests/style-engine/styleEngine.php
index b1a01563c2097..b208e4ef0575a 100644
--- a/tests/phpunit/tests/style-engine/styleEngine.php
+++ b/tests/phpunit/tests/style-engine/styleEngine.php
@@ -27,6 +27,7 @@ public function tear_down() {
* @ticket 56467
* @ticket 58549
* @ticket 58590
+ * @ticket 60175
*
* @covers ::wp_style_engine_get_styles
*
@@ -252,19 +253,26 @@ public function data_wp_style_engine_get_styles() {
'elements_with_css_var_value' => array(
'block_styles' => array(
- 'color' => array(
+ 'color' => array(
'text' => 'var:preset|color|my-little-pony',
),
+ 'typography' => array(
+ 'fontSize' => 'var:preset|font-size|cabbage-patch',
+ 'fontFamily' => 'var:preset|font-family|transformers',
+ ),
),
'options' => array(
'selector' => '.wp-selector',
),
'expected_output' => array(
- 'css' => '.wp-selector{color:var(--wp--preset--color--my-little-pony);}',
+ 'css' => '.wp-selector{color:var(--wp--preset--color--my-little-pony);font-size:var(--wp--preset--font-size--cabbage-patch);font-family:var(--wp--preset--font-family--transformers);}',
'declarations' => array(
- 'color' => 'var(--wp--preset--color--my-little-pony)',
+ 'color' => 'var(--wp--preset--color--my-little-pony)',
+ 'font-size' => 'var(--wp--preset--font-size--cabbage-patch)',
+ 'font-family' => 'var(--wp--preset--font-family--transformers)',
+
),
- 'classnames' => 'has-text-color has-my-little-pony-color',
+ 'classnames' => 'has-text-color has-my-little-pony-color has-cabbage-patch-font-size has-transformers-font-family',
),
),
@@ -513,18 +521,22 @@ public function data_wp_style_engine_get_styles() {
'inline_background_image_url_with_background_size' => array(
'block_styles' => array(
'background' => array(
- 'backgroundImage' => array(
+ 'backgroundImage' => array(
'url' => 'https://example.com/image.jpg',
),
- 'backgroundSize' => 'cover',
+ 'backgroundPosition' => 'center',
+ 'backgroundRepeat' => 'no-repeat',
+ 'backgroundSize' => 'cover',
),
),
'options' => array(),
'expected_output' => array(
- 'css' => "background-image:url('https://example.com/image.jpg');background-size:cover;",
+ 'css' => "background-image:url('https://example.com/image.jpg');background-position:center;background-repeat:no-repeat;background-size:cover;",
'declarations' => array(
- 'background-image' => "url('https://example.com/image.jpg')",
- 'background-size' => 'cover',
+ 'background-image' => "url('https://example.com/image.jpg')",
+ 'background-position' => 'center',
+ 'background-repeat' => 'no-repeat',
+ 'background-size' => 'cover',
),
),
),
diff --git a/tests/phpunit/tests/term/wpInsertTerm.php b/tests/phpunit/tests/term/wpInsertTerm.php
index d99593b1d5f2e..798db9233bfc8 100644
--- a/tests/phpunit/tests/term/wpInsertTerm.php
+++ b/tests/phpunit/tests/term/wpInsertTerm.php
@@ -895,6 +895,19 @@ public function test_wp_insert_term_with_null_description() {
$this->assertSame( '', $term_object->description );
}
+ /**
+ * @ticket 59995
+ */
+ public function test_wp_insert_term_with_empty_name_after_db_sanitization() {
+ $term = wp_insert_term(
+ '',
+ 'post_tag'
+ );
+
+ $this->assertWPError( $term );
+ $this->assertSame( 'invalid_term_name', $term->get_error_code() );
+ }
+
/** Helpers */
public function deleted_term_cb( $term, $tt_id, $taxonomy, $deleted_term, $object_ids ) {
diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php
index cf5ea9ad6c208..a70bf9e7ff60a 100644
--- a/tests/phpunit/tests/theme.php
+++ b/tests/phpunit/tests/theme.php
@@ -1259,8 +1259,8 @@ function () use ( $new_root ) {
// Cleanup.
switch_theme( $old_theme->get_stylesheet() );
- $this->assertEquals( $old_root . '/test', $path1, 'The original stylesheet path is not correct' );
- $this->assertEquals( $new_root . '/test', $path2, 'The new stylesheet path is not correct' );
+ $this->assertSame( $old_root . '/test', $path1, 'The original stylesheet path is not correct' );
+ $this->assertSame( $new_root . '/test', $path2, 'The new stylesheet path is not correct' );
}
/**
@@ -1302,7 +1302,7 @@ function () use ( $new_root ) {
// Cleanup.
switch_theme( $old_theme->get_stylesheet() );
- $this->assertEquals( $old_root . '/test-parent', $path1, 'The original template path is not correct' );
- $this->assertEquals( $new_root . '/test-parent', $path2, 'The new template path is not correct' );
+ $this->assertSame( $old_root . '/test-parent', $path1, 'The original template path is not correct' );
+ $this->assertSame( $new_root . '/test-parent', $path2, 'The new template path is not correct' );
}
}
diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php
index 6da723583ba45..49e1661844b10 100644
--- a/tests/phpunit/tests/theme/wpThemeJson.php
+++ b/tests/phpunit/tests/theme/wpThemeJson.php
@@ -264,6 +264,7 @@ public function test_get_settings_appearance_true_opts_in() {
$expected = array(
'background' => array(
'backgroundImage' => true,
+ 'backgroundSize' => true,
),
'border' => array(
'width' => true,
@@ -300,6 +301,7 @@ public function test_get_settings_appearance_true_opts_in() {
'core/group' => array(
'background' => array(
'backgroundImage' => true,
+ 'backgroundSize' => true,
),
'border' => array(
'width' => true,
diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
index cc7cfa2f65238..dd5fff2bff8ef 100644
--- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php
+++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
@@ -433,6 +433,9 @@ public function data_get_core_data() {
/**
* @ticket 54336
+ * @ticket 60118
+ *
+ * @covers ::add_theme_support
*/
public function test_add_theme_supports_are_loaded_for_themes_without_theme_json() {
switch_theme( 'default' );
@@ -455,15 +458,18 @@ public function test_add_theme_supports_are_loaded_for_themes_without_theme_json
);
add_theme_support( 'editor-color-palette', $color_palette );
add_theme_support( 'custom-line-height' );
+ add_theme_support( 'appearance-tools' );
$settings = WP_Theme_JSON_Resolver::get_theme_data()->get_settings();
remove_theme_support( 'custom-line-height' );
remove_theme_support( 'editor-color-palette' );
+ remove_theme_support( 'appearance-tools' );
$this->assertFalse( wp_theme_has_theme_json() );
$this->assertTrue( $settings['typography']['lineHeight'] );
$this->assertSame( $color_palette, $settings['color']['palette']['theme'] );
+ $this->assertTrue( $settings['border']['color'], 'Support for "appearance-tools" was not added.' );
}
/**