Changeset 48121 for trunk/tests/phpunit/tests/comment/checkComment.php

Timestamp:

06/22/2020 05:24:34 PM (4 years ago)

Author:

desrosj

Message:

General: Remove “whitelist” and “blacklist” in favor of more clear and inclusive language.

“The WordPress open source community cares about diversity. We strive to maintain a welcoming environment where everyone can feel included.”

With this commit, all occurrences of “whitelist” and “blacklist” (with the single exception of the $new_whitelist_options global variable) are removed. A new ticket has been opened to explore renaming the $new_whitelist_options variable (#50434).

Changing to more specific names or rewording sentences containing these terms not only makes the code more inclusive, but also helps provide clarity. These terms are often ambiguous. What is being blocked or allowed is not always immediately clear. This can make it more difficult for non-native English speakers to read through the codebase.

Words matter. If one contributor feels more welcome because these terms are removed, this was worth the effort.

Props strangerstudios, jorbin, desrosj, joemcgill, timothyblynjacobs, ocean90, ayeshrajans, davidbaumwald, earnjam.
See #48900, #50434.
Fixes #50413.

File:

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

trunk/tests/phpunit/tests/comment/checkComment.php

@@ -5 +5 @@
  */
 class Tests_Comment_CheckComment extends WP_UnitTestCase {
-    public function test_should_return_true_when_comment_whitelist_is_disabled() {
+    public function test_should_return_true_when_comment_previously_approved_is_disabled() {
         $author       = 'BobtheBuilder';
         $author_email = 'bob@example.com';
@@ -14 +14 @@
         $comment_type = '';
 
-        update_option( 'comment_whitelist', 0 );
+        update_option( 'comment_previously_approved', 0 );
         $results = check_comment( $author, $author_email, $author_url, $comment, $author_ip, $user_agent, $comment_type );
         $this->assertTrue( $results );
     }
 
-    public function test_should_return_false_when_comment_whitelist_is_enabled_and_author_does_not_have_approved_comment() {
+    public function test_should_return_false_when_comment_previously_approved_is_enabled_and_author_does_not_have_approved_comment() {
         $author       = 'BobtheBuilder';
         $author_email = 'bob@example.com';
@@ -28 +28 @@
         $comment_type = '';
 
-        update_option( 'comment_whitelist', 1 );
+        update_option( 'comment_previously_approved', 1 );
         $results = check_comment( $author, $author_email, $author_url, $comment, $author_ip, $user_agent, $comment_type );
         $this->assertFalse( $results );
@@ -34 +34 @@
     }
 
-    public function test_should_return_true_when_comment_whitelist_is_enabled_and_author_has_approved_comment() {
+    public function test_should_return_true_when_comment_previously_approved_is_enabled_and_author_has_approved_comment() {
         $post_id         = self::factory()->post->create();
         $prev_args       = array(
@@ -45 +45 @@
         $prev_comment_id = self::factory()->comment->create( $prev_args );
 
-        update_option( 'comment_whitelist', 1 );
+        update_option( 'comment_previously_approved', 1 );
 
         $author       = 'BobtheBuilder';
@@ -70 +70 @@
 
     public function test_should_return_false_when_content_matches_moderation_key() {
-        update_option( 'comment_whitelist', 0 );
+        update_option( 'comment_previously_approved', 0 );
 
         $author       = 'WendytheBuilder';
@@ -86 +86 @@
 
     public function test_should_return_true_when_content_does_not_match_moderation_keys() {
-        update_option( 'comment_whitelist', 0 );
+        update_option( 'comment_previously_approved', 0 );
 
         $author       = 'WendytheBuilder';
@@ -102 +102 @@
 
     public function test_should_return_false_when_link_count_exceeds_comment_max_length_setting() {
-        update_option( 'comment_whitelist', 0 );
+        update_option( 'comment_previously_approved', 0 );
 
         $author       = 'BobtheBuilder';
@@ -118 +118 @@
 
     public function test_should_return_true_when_link_count_does_not_exceed_comment_max_length_setting() {
-        update_option( 'comment_whitelist', 0 );
+        update_option( 'comment_previously_approved', 0 );
 
         $author       = 'BobtheBuilder';
@@ -136 +136 @@
      * @ticket 28603
      */
-    public function test_should_return_true_when_comment_whitelist_is_enabled_and_user_has_previously_approved_comments_with_different_email() {
+    public function test_should_return_true_when_comment_previously_approved_is_enabled_and_user_has_previously_approved_comments_with_different_email() {
         $subscriber_id = $this->factory()->user->create(
             array(
@@ -159 +159 @@
         wp_update_user( $subscriber_user );
 
-        update_option( 'comment_whitelist', 1 );
+        update_option( 'comment_previously_approved', 1 );
 
         $results = check_comment( 'foo', 'newsub@example.com', 'http://example.com', 'This is a comment.', '66.155.40.249', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:35.0) Gecko/20100101 Firefox/35.0', 'comment', 4 );
@@ -168 +168 @@
      * @ticket 28603
      */
-    public function test_should_return_false_when_comment_whitelist_is_enabled_and_user_does_not_have_a_previously_approved_comment_with_any_email() {
+    public function test_should_return_false_when_comment_previously_approved_is_enabled_and_user_does_not_have_a_previously_approved_comment_with_any_email() {
         $subscriber_id = $this->factory()->user->create(
             array(
@@ -181 +181 @@
         wp_update_user( $subscriber_user );
 
-        update_option( 'comment_whitelist', 1 );
+        update_option( 'comment_previously_approved', 1 );
 
         $results = check_comment( 'bar', 'zag@example.com', 'http://example.com', 'This is my first comment.', '66.155.40.249', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:35.0) Gecko/20100101 Firefox/35.0', 'comment', 4 );