Merge branch 'html-api/tests-wp-rel-ugc' into wp-kses-hair-fixes

dmsnell · dmsnell · commit b7c0beb41656 · 2025-07-13T13:43:51.000-05:00
diff --git a/tests/phpunit/tests/formatting/wpRelUgc.php b/tests/phpunit/tests/formatting/wpRelUgc.php
@@ -13,7 +13,7 @@ class Tests_Formatting_wpRelUgc extends WP_UnitTestCase {
 	public function test_add_ugc() {
 		$content  = '<p>This is some cool <a href="/">Code</a></p>';
 		$expected = '<p>This is some cool <a href=\"/\" rel=\"nofollow ugc\">Code</a></p>';
-		$this->assertSame( $expected, wp_rel_ugc( $content ) );
+		$this->assertEqualHTML( $expected, wp_rel_ugc( $content ) );
 	}
 
 	/**
@@ -22,15 +22,15 @@ public function test_add_ugc() {
 	public function test_convert_ugc() {
 		$content  = '<p>This is some cool <a href="/" rel="weird">Code</a></p>';
 		$expected = '<p>This is some cool <a href=\"/\" rel=\"weird nofollow ugc\">Code</a></p>';
-		$this->assertSame( $expected, wp_rel_ugc( $content ) );
+		$this->assertEqualHTML( $expected, wp_rel_ugc( $content ) );
 	}
 
 	/**
 	 * @ticket 48022
 	 * @dataProvider data_wp_rel_ugc
 	 */
 	public function test_wp_rel_ugc( $input, $output, $expect_deprecation = false ) {
-		$this->assertSame( wp_slash( $output ), wp_rel_ugc( $input ) );
+		$this->assertEqualHTML( wp_slash( $output ), wp_rel_ugc( $input ) );
 	}
 
 	public function data_wp_rel_ugc() {
@@ -82,6 +82,6 @@ public function test_append_ugc_with_valueless_attribute() {
 
 		$content  = '<p>This is some cool <a href="demo.com" download rel="hola">Code</a></p>';
 		$expected = '<p>This is some cool <a href=\"demo.com\" download rel=\"hola nofollow ugc\">Code</a></p>';
-		$this->assertSame( $expected, wp_rel_ugc( $content ) );
+		$this->assertEqualHTML( $expected, wp_rel_ugc( $content ) );
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class Tests_Formatting_wpRelUgc extends WP_UnitTestCase {`
`13`	`13`	`public function test_add_ugc() {`
`14`	`14`	`$content = '<p>This is some cool <a href="/">Code</a></p>';`
`15`	`15`	`$expected = '<p>This is some cool <a href=\"/\" rel=\"nofollow ugc\">Code</a></p>';`
`16`		`- $this->assertSame( $expected, wp_rel_ugc( $content ) );`
	`16`	`+ $this->assertEqualHTML( $expected, wp_rel_ugc( $content ) );`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/**`
`@@ -22,15 +22,15 @@ public function test_add_ugc() {`
`22`	`22`	`public function test_convert_ugc() {`
`23`	`23`	`$content = '<p>This is some cool <a href="/" rel="weird">Code</a></p>';`
`24`	`24`	`$expected = '<p>This is some cool <a href=\"/\" rel=\"weird nofollow ugc\">Code</a></p>';`
`25`		`- $this->assertSame( $expected, wp_rel_ugc( $content ) );`
	`25`	`+ $this->assertEqualHTML( $expected, wp_rel_ugc( $content ) );`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* @ticket 48022`
`30`	`30`	`* @dataProvider data_wp_rel_ugc`
`31`	`31`	`*/`
`32`	`32`	`public function test_wp_rel_ugc( $input, $output, $expect_deprecation = false ) {`
`33`		`- $this->assertSame( wp_slash( $output ), wp_rel_ugc( $input ) );`
	`33`	`+ $this->assertEqualHTML( wp_slash( $output ), wp_rel_ugc( $input ) );`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public function data_wp_rel_ugc() {`
`@@ -82,6 +82,6 @@ public function test_append_ugc_with_valueless_attribute() {`
`82`	`82`
`83`	`83`	`$content = '<p>This is some cool <a href="demo.com" download rel="hola">Code</a></p>';`
`84`	`84`	`$expected = '<p>This is some cool <a href=\"demo.com\" download rel=\"hola nofollow ugc\">Code</a></p>';`
`85`		`- $this->assertSame( $expected, wp_rel_ugc( $content ) );`
	`85`	`+ $this->assertEqualHTML( $expected, wp_rel_ugc( $content ) );`
`86`	`86`	`}`
`87`	`87`	`}`