Changeset 34172

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

Location:

trunk/tests/phpunit

Files:

• includes/bootstrap.php (modified) (1 diff)
• tests/ajax/ReplytoComment.php (modified) (1 diff)
• tests/comment.php (modified) (4 diffs)
• tests/multisite.php (modified) (1 diff)
• tests/multisite/bootstrap.php (modified) (1 diff)
• tests/multisite/ms-files-rewriting.php (modified) (1 diff)
• tests/multisite/network.php (modified) (1 diff)
• tests/option/multisite.php (modified) (1 diff)
• tests/user/multisite.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -39 +39 @@
 $_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
 $_SERVER['REQUEST_METHOD'] = 'GET';
+$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
 

trunk/tests/phpunit/tests/ajax/ReplytoComment.php

@@ -39 +39 @@
         $post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
         $this->_draft_post = get_post( $post_id );
-
-        $_SERVER['REMOTE_ADDR'] = '';
     }
 

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'] );
-        }
     }
 

trunk/tests/phpunit/tests/multisite.php

@@ -15 +15 @@
         parent::setUp();
         $this->suppress = $wpdb->suppress_errors();
-
-        $_SERVER['REMOTE_ADDR'] = '';
     }
 

trunk/tests/phpunit/tests/multisite/bootstrap.php

@@ -16 +16 @@
         parent::setUp();
         $this->suppress = $wpdb->suppress_errors();
-
-        $_SERVER[ 'REMOTE_ADDR' ] = '';
     }
 

trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ -19 +19 @@
         parent::setUp();
         $this->suppress = $wpdb->suppress_errors();
-
-        $_SERVER[ 'REMOTE_ADDR' ] = '';
 
         update_site_option( 'ms_files_rewriting', 1 );

trunk/tests/phpunit/tests/multisite/network.php

@@ -17 +17 @@
         parent::setUp();
         $this->suppress = $wpdb->suppress_errors();
-
-        $_SERVER[ 'REMOTE_ADDR' ] = '';
     }
 

trunk/tests/phpunit/tests/option/multisite.php

@@ -17 +17 @@
         parent::setUp();
         $this->suppress = $wpdb->suppress_errors();
-
-        $_SERVER['REMOTE_ADDR'] = null;
     }
 

trunk/tests/phpunit/tests/user/multisite.php

@@ -17 +17 @@
         parent::setUp();
         $this->suppress = $wpdb->suppress_errors();
-
-        $_SERVER[ 'REMOTE_ADDR' ] = '';
     }