Skip to content

Commit 4b7fcef

Browse files
committed
Update styles tests to use assertEqualHTML
`assertEqualHTML` makes the tests more resilient to semantically irrelevant changes.
1 parent 102c39b commit 4b7fcef

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

tests/phpunit/tests/dependencies/styles.php

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function test_wp_enqueue_style() {
6868
$expected .= "<link rel='stylesheet' id='no-deps-null-version-css' href='http://example.com' type='text/css' media='all' />\n";
6969
$expected .= "<link rel='stylesheet' id='no-deps-null-version-print-media-css' href='http://example.com' type='text/css' media='print' />\n";
7070

71-
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
71+
$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
7272

7373
// No styles left to print.
7474
$this->assertSame( '', get_echo( 'wp_print_styles' ) );
@@ -88,7 +88,7 @@ public function test_wp_enqueue_style_with_html5_support_does_not_contain_type_a
8888
$ver = get_bloginfo( 'version' );
8989
$expected = "<link rel='stylesheet' id='no-deps-no-version-css' href='http://example.com?ver=$ver' media='all' />\n";
9090

91-
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
91+
$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
9292
}
9393

9494
/**
@@ -103,7 +103,7 @@ public function test_awkward_handles_are_supported_consistently( $handle ) {
103103

104104
$expected = "<link rel='stylesheet' id='$handle-css' href='http://example.com' type='text/css' media='all' />\n";
105105

106-
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
106+
$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
107107
}
108108

109109
/**
@@ -157,7 +157,7 @@ public function test_protocols() {
157157
$expected .= "<link rel='stylesheet' id='reset-css-ftp-css' href='{$wp_styles->base_url}ftp://yui.yahooapis.com/2.8.1/build/reset/reset-min.css?ver=$ver' type='text/css' media='all' />\n";
158158

159159
// Go!
160-
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
160+
$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
161161

162162
// No styles left to print.
163163
$this->assertSame( '', get_echo( 'wp_print_styles' ) );
@@ -186,8 +186,7 @@ public function test_inline_styles() {
186186
wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
187187
wp_add_inline_style( 'handle', $style );
188188

189-
// No styles left to print.
190-
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
189+
$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
191190
}
192191

193192
/**
@@ -215,7 +214,7 @@ public function test_inline_styles_concat() {
215214
wp_add_inline_style( 'handle', $style );
216215

217216
wp_print_styles();
218-
$this->assertSame( $expected, $wp_styles->print_html );
217+
$this->assertEqualHTML( $expected, $wp_styles->print_html );
219218
}
220219

221220
/**
@@ -233,7 +232,7 @@ public function test_inline_styles_concat() {
233232
* @param string $expected Expected result.
234233
*/
235234
public function test_normalize_relative_css_links( $css, $expected ) {
236-
$this->assertSame(
235+
$this->assertEqualHTML(
237236
$expected,
238237
_wp_normalize_relative_css_links( $css, site_url( 'wp-content/themes/test/style.css' ) )
239238
);
@@ -311,8 +310,7 @@ public function test_multiple_inline_styles() {
311310
wp_add_inline_style( 'handle', $style1 );
312311
wp_add_inline_style( 'handle', $style2 );
313312

314-
// No styles left to print.
315-
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
313+
$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
316314
}
317315

318316
/**
@@ -337,7 +335,7 @@ public function test_plugin_doing_inline_styles_wrong() {
337335

338336
wp_add_inline_style( 'handle', "<style>{$style}</style>" );
339337

340-
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
338+
$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
341339
}
342340

343341
/**
@@ -351,7 +349,7 @@ public function test_unnecessary_style_tags() {
351349

352350
wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
353351

354-
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
352+
$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
355353
}
356354

357355
/**
@@ -399,7 +397,7 @@ public function test_wp_add_inline_style_for_handle_without_source() {
399397
wp_enqueue_style( 'handle-three' );
400398
wp_add_inline_style( 'handle-three', $style );
401399

402-
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
400+
$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
403401
}
404402

405403
/**

0 commit comments

Comments
 (0)