Changeset 51135 for trunk/tests/phpunit/tests/rest-api/rest-widgets-controller.php

Timestamp:

06/09/2021 07:41:47 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Ignore EOL differences in some tests using multiline string assertions.

Unix vs. Windows EOL style mismatches can cause misleading failures in tests using the heredoc syntax (<<<) or multiline strings as the expected result.

Follow-up to [48466], [50995], [51079].

See #52625.

File:

• trunk/tests/phpunit/tests/rest-api/rest-widgets-controller.php (modified) (8 diffs)

trunk/tests/phpunit/tests/rest-api/rest-widgets-controller.php

@@ -382 +382 @@
         $data               = $response->get_data();
         $data               = $this->remove_links( $data );
-        $this->assertEqualSets(
+        $this->assertSameIgnoreEOL(
             array(
                 array(
@@ -388 +388 @@
                     'id_base'       => 'text',
                     'sidebar'       => 'sidebar-1',
+                    'rendered'      => '<div class="textwidget">Custom text test</div>',
+                    'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
+                                    '           <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
+                                    '           <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
+                                    '           <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
                     'instance'      => array(
                         'encoded' => base64_encode(
@@ -407 +412 @@
                         ),
                     ),
-                    'rendered'      => '<div class="textwidget">Custom text test</div>',
-                    'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
-                                    '           <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
-                                    '           <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
-                                    '           <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
                 ),
                 array(
@@ -1208 +1208 @@
         $response = rest_do_request( $request );
 
-        $this->assertEqualSets(
+        $this->assertSameIgnoreEOL(
             array(
                 'id'            => 'text-1',
                 'id_base'       => 'text',
                 'sidebar'       => 'wp_inactive_widgets',
+                'rendered'      => '',
+                'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
+                                '           <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
+                                '           <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
+                                '           <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
                 'instance'      => array(
                     'encoded' => base64_encode(
@@ -1232 +1237 @@
                     ),
                 ),
-                'rendered'      => '',
-                'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
-                                '           <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
-                                '           <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
-                                '           <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
             ),
             $response->get_data()
@@ -1265 +1265 @@
         $response = rest_do_request( $request );
 
-        $this->assertEqualSets(
+        $this->assertSameIgnoreEOL(
             array(
                 'deleted'  => true,
@@ -1273 +1273 @@
                     'id_base'       => 'text',
                     'sidebar'       => 'sidebar-1',
+                    'rendered'      => '<div class="textwidget">Custom text test</div>',
+                    'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
+                                    '           <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
+                                    '           <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
+                                    '           <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
                     'instance'      => array(
                         'encoded' => base64_encode(
@@ -1292 +1297 @@
                         ),
                     ),
-                    'rendered'      => '<div class="textwidget">Custom text test</div>',
-                    'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
-                                    '           <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
-                                    '           <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
-                                    '           <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
 
                 ),