Changeset 5946

Timestamp:

10/27/2015 12:07:35 PM (10 years ago)

Author:

netweb

Message:

Users: Update $_SERVER['REMOTE_ADDR'] IP adress check to 127.0.0.1 in bbp_current_author_ip()

This changeset updates our unit tests and ensures compatability with WordPress test suite where in ​[WP34172] $_SERVER[ 'REMOTE_ADDR' ] is now initialised during the test bootstrap so individual tests need not.

Props thebrandonallen. See #2883.

Location:

trunk

Files:

• src/includes/users/functions.php (modified) (2 diffs)
• tests/phpunit/includes/install.php (modified) (1 diff)
• tests/phpunit/testcases/core/update.php (modified) (2 diffs)
• tests/phpunit/testcases/users/template/user.php (modified) (1 diff)

trunk/src/includes/users/functions.php

@@ -139 +139 @@
  * Get the poster IP address
  *
- * @since bbPress (r3120)
+ * @since 2.0.0 bbPress (r3120)
+ * @since 2.6.0 bbPress (r5609) Added `empty()` check for unit tests
  *
  * @return string
@@ -148 +149 @@
     $remote_address = ! empty( $_SERVER['REMOTE_ADDR'] )
         ? $_SERVER['REMOTE_ADDR']
-        : '0.0.0.0';
+        : '127.0.0.1';
 
     // Remove any unsavory bits

trunk/tests/phpunit/includes/install.php

@@ -32 +32 @@
 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 $_SERVER['HTTP_HOST']       = WP_TESTS_DOMAIN;
-$_SERVER['REMOTE_ADDR']     = '0.0.0.0';
+$_SERVER['REMOTE_ADDR']     = '127.0.0.1';
 
 // Fix PHP identity crisis

trunk/tests/phpunit/testcases/core/update.php

@@ -132 +132 @@
 
         // Topic meta
-        $this->assertSame( '0.0.0.0', bbp_current_author_ip( $topic_id ) );
+        $this->assertSame( '127.0.0.1', bbp_current_author_ip( $topic_id ) );
         $this->assertSame( $forum_id, bbp_get_topic_forum_id( $topic_id ) );
         $this->assertSame( 1, bbp_get_topic_voice_count( $topic_id, true ) );
@@ -142 +142 @@
 
         // Reply Meta
-        $this->assertSame( '0.0.0.0', bbp_current_author_ip( $reply_id ) );
+        $this->assertSame( '127.0.0.1', bbp_current_author_ip( $reply_id ) );
         $this->assertSame( $forum_id, bbp_get_reply_forum_id( $reply_id ) );
         $this->assertSame( $topic_id, bbp_get_reply_topic_id( $reply_id ) );

trunk/tests/phpunit/testcases/users/template/user.php

@@ -324 +324 @@
         $t = $this->factory->topic->create();
 
-        $author_ip = '<span class="bbp-author-ip">(0.0.0.0)</span>';
+        $author_ip = '<span class="bbp-author-ip">(127.0.0.1)</span>';
 
         // String.