Changeset 10868

Timestamp:

06/02/2016 02:14:54 AM (9 years ago)

Author:

r-a-y

Message:

Fix unit test for #7107.

This test broke after the "Comment Blacklist" moderation filter no longer
marks activity items as spam. (See r10860.)

To fix the test, we explicitly set the new activity item as spam.

File:

• trunk/tests/phpunit/testcases/blogs/activity.php (modified) (3 diffs)

trunk/tests/phpunit/testcases/blogs/activity.php

@@ -704 +704 @@
         ) );
 
-        // Update 'Comment blacklist' section to include some words we want to block.
-        update_option( 'blacklist_keys', 'yolo' );
+        // Set activity item to spam.
+        add_action( 'bp_activity_before_save', array( $this, 'set_activity_to_spam' ) );
 
         // Create spammed activity comment.
@@ -723 +723 @@
         // Reset.
         remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
-        update_option( 'blacklist_keys', '' );
+        remove_action( 'bp_activity_before_save', array( $this, 'set_activity_to_spam' ) );
 
         $this->set_current_user( $old_user );
@@ -754 +754 @@
         return $a;
     }
+
+    /**
+     * Explicitly set activity to spam.
+     */
+    public function set_activity_to_spam( $activity ) {
+        $activity->is_spam = 1;
+    }
 }