Changeset 34172 for trunk/tests/phpunit/tests/comment.php

Timestamp:

09/15/2015 08:04:33 AM (9 years ago)

Author:

johnbillion

Message:

Initialise $_SERVER[ 'REMOTE_ADDR' ] during the test bootstrap so individual tests need not.

Fixes #33877
Fixes #25162

File:

• trunk/tests/phpunit/tests/comment.php (modified) (4 diffs)

trunk/tests/phpunit/tests/comment.php

@@ -78 +78 @@
      */
     public function test_wp_new_comment_respects_dates() {
-        // `wp_new_comment()` checks REMOTE_ADDR, so we fake it to avoid PHP notices.
-        if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-            $remote_addr = $_SERVER['REMOTE_ADDR'];
-        } else {
-            $_SERVER['REMOTE_ADDR'] = '';
-        }
-
         $u = $this->factory->user->create();
         $post_id = $this->factory->post->create( array( 'post_author' => $u ) );
@@ -105 +98 @@
         $this->assertEquals( $data['comment_date'], $comment->comment_date );
         $this->assertEquals( $data['comment_date_gmt'], $comment->comment_date_gmt );
-
-        // Cleanup.
-        if ( isset( $remote_addr ) ) {
-            $_SERVER['REMOTE_ADDR'] = $remote_addr;
-        } else {
-            unset( $_SERVER['REMOTE_ADDR'] );
-        }
     }
 
@@ -239 +225 @@
 
     public function test_comment_field_lengths() {
-        // `wp_new_comment()` checks REMOTE_ADDR, so we fake it to avoid PHP notices.
-        if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-            $remote_addr = $_SERVER['REMOTE_ADDR'];
-        } else {
-            $_SERVER['REMOTE_ADDR'] = '';
-        }
-
         $u = $this->factory->user->create();
         $post_id = $this->factory->post->create( array( 'post_author' => $u ) );
@@ -265 +244 @@
 
         $this->assertEquals( strlen( $comment->comment_content ), 65535 );
-
-        // Cleanup.
-        if ( isset( $remote_addr ) ) {
-            $_SERVER['REMOTE_ADDR'] = $remote_addr;
-        } else {
-            unset( $_SERVER['REMOTE_ADDR'] );
-        }
     }