Changeset 36711 for trunk/tests/phpunit/tests/post/attachments.php

Timestamp:

02/25/2016 09:17:34 PM (9 years ago)

Author:

johnbillion

Message:

Move some assertions in HTTPS related tests, so failures that occur before the environment reset don't result in a contaminated test environment.

See #35954

File:

• trunk/tests/phpunit/tests/post/attachments.php (modified) (7 diffs)

trunk/tests/phpunit/tests/post/attachments.php

@@ -302 +302 @@
 
         $url = wp_get_attachment_url( $attachment_id );
-        $this->assertSame( set_url_scheme( $url, 'http' ), $url );
 
         // Cleanup.
         $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
+
+        $this->assertSame( 'http', parse_url( $url, PHP_URL_SCHEME ) );
     }
 
@@ -331 +332 @@
 
         $url = wp_get_attachment_url( $attachment_id );
-        $this->assertSame( set_url_scheme( $url, 'http' ), $url );
 
         // Cleanup.
         $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
+
+        $this->assertSame( 'http', parse_url( $url, PHP_URL_SCHEME ) );
     }
 
@@ -361 +363 @@
         $_SERVER['HTTPS'] = 'on';
 
-        // Verify that server host matches the host of wp_upload_dir().
+        // Ensure that server host matches the host of wp_upload_dir().
         $upload_dir = wp_upload_dir();
         $_SERVER['HTTP_HOST'] = parse_url( $upload_dir['baseurl'], PHP_URL_HOST );
@@ -367 +369 @@
         // Test that wp_get_attachemt_url returns with https scheme.
         $url = wp_get_attachment_url( $attachment_id );
-        $this->assertSame( set_url_scheme( $url, 'https' ), $url );
 
         // Cleanup.
         $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
         $_SERVER['HTTP_HOST'] = $http_host;
+
+        $this->assertSame( 'https', parse_url( $url, PHP_URL_SCHEME ) );
     }
 
@@ -396 +399 @@
         $_SERVER['HTTPS'] = 'on';
 
-        // Verify that server host matches the host of wp_upload_dir().
+        // Ensure that server host matches the host of wp_upload_dir().
         $upload_dir = wp_upload_dir();
         $_SERVER['HTTP_HOST'] = parse_url( $upload_dir['baseurl'], PHP_URL_HOST );
@@ -402 +405 @@
         // Test that wp_get_attachemt_url returns with https scheme.
         $url = wp_get_attachment_url( $attachment_id );
-        $this->assertSame( set_url_scheme( $url, 'https' ), $url );
 
         // Cleanup.
         $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
         $_SERVER['HTTP_HOST'] = $http_host;
+
+        $this->assertSame( 'https', parse_url( $url, PHP_URL_SCHEME ) );
     }
 
@@ -465 +469 @@
         remove_filter( 'upload_dir', '_upload_dir_https' );
 
-        $this->assertSame( set_url_scheme( $url, 'https' ), $url );
+        $this->assertSame( 'https', parse_url( $url, PHP_URL_SCHEME ) );
     }