Changeset 53574

Timestamp:

06/24/2022 03:07:40 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Replace esc_url_raw() calls with sanitize_url().

Previously committed in [53455], appears to be accidentally reverted in [53562].

Follow-up to [51597], [53452], [53455], [53562].

See #39265, #55652.

File:

• trunk/tests/phpunit/tests/formatting/escUrl.php (modified) (5 diffs)

trunk/tests/phpunit/tests/formatting/escUrl.php

@@ -51 +51 @@
         /**
          * @covers ::esc_url
-         * @covers ::esc_url_raw
+         * @covers ::sanitize_url
          */
         public function test_all_url_parts() {
@@ -69 +69 @@
                         parse_url( $url )
                 );
-                $this->assertSame( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url_raw( $url ) );
+                $this->assertSame( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', sanitize_url( $url ) );
                 $this->assertSame( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url( $url ) );
         }
@@ -86 +86 @@
         /**
          * @covers ::esc_url
-         * @covers ::esc_url_raw
+         * @covers ::sanitize_url
          */
         public function test_encoding() {
-                $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );
-                $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );
-                $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );
+                $this->assertSame( 'http://example.com?foo=1&bar=2', sanitize_url( 'http://example.com?foo=1&bar=2' ) );
+                $this->assertSame( 'http://example.com?foo=1&bar=2', sanitize_url( 'http://example.com?foo=1&bar=2' ) );
+                $this->assertSame( 'http://example.com?foo=1&bar=2', sanitize_url( 'http://example.com?foo=1&bar=2' ) );
 
                 $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url( 'http://example.com?foo=1&bar=2' ) );
@@ -225 +225 @@
          * Courtesy of http://blog.lunatech.com/2009/02/03/what-every-web-developer-must-know-about-url-encoding
          *
-         * @covers ::esc_url_raw
+         * @covers ::sanitize_url
          */
         public function test_reserved_characters() {
                 $url = "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$%27()*+,;=/?:@-._~!$%27()*+,;==#/?:@-._~!$&'()*+,;=";
-                $this->assertSame( $url, esc_url_raw( $url ) );
+                $this->assertSame( $url, sanitize_url( $url ) );
         }
 
@@ -291 +291 @@
          * @ticket 28015
          *
-         * @covers ::esc_url_raw
+         * @covers ::sanitize_url
          */
         public function test_invalid_charaters() {
-                $this->assertEmpty( esc_url_raw( '"^<>{}`' ) );
+                $this->assertEmpty( sanitize_url( '"^<>{}`' ) );
         }