Changeset 36711 for trunk/tests/phpunit/tests/rewrite.php

Timestamp:

02/25/2016 09:17:34 PM (6 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/rewrite.php (modified) (1 diff)

trunk/tests/phpunit/tests/rewrite.php

@@ -106 +106 @@
         // Save server data for cleanup
         $is_ssl = is_ssl();
-        $http_host = $_SERVER['HTTP_HOST'];
 
         $_SERVER['HTTPS'] = 'on';
 
-        $post_id = self::factory()->post->create();
-        $permalink = get_permalink( $post_id );
-        $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'http' ) ) );
-
-        $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
-        $permalink = get_permalink( $post_id );
-        $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'http' ) ) );
+        $post_id        = self::factory()->post->create();
+        $post_permalink = get_permalink( $post_id );
+        $post_url_to_id = url_to_postid( set_url_scheme( $post_permalink, 'http' ) );
+
+        $page_id        = self::factory()->post->create( array( 'post_type' => 'page' ) );
+        $page_permalink = get_permalink( $page_id );
+        $page_url_to_id = url_to_postid( set_url_scheme( $page_permalink, 'http' ) );
 
         // Cleanup.
         $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
-        $_SERVER['HTTP_HOST'] = $http_host;
+
+        $this->assertEquals( $post_id, $post_url_to_id );
+        $this->assertEquals( $page_id, $page_url_to_id );
     }