Changeset 48231

Timestamp:

06/30/2020 12:27:05 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Place remove_filter() calls for _wp_update_comment_data_filter() before the assertions, for consistency with other tests.

Follow-up to [48154], [48222].

See #39732.

Location:

trunk/tests/phpunit/tests

Files:

• comment.php (modified) (2 diffs)
• rest-api/rest-comments-controller.php (modified) (1 diff)

trunk/tests/phpunit/tests/comment.php

@@ -150 +150 @@
 
         add_filter( 'wp_update_comment_data', array( $this, '_wp_update_comment_data_filter' ), 10, 3 );
+
         $result = wp_update_comment(
             array(
@@ -157 +158 @@
             true
         );
+
+        remove_filter( 'wp_update_comment_data', array( $this, '_wp_update_comment_data_filter' ), 10, 3 );
+
         $this->assertWPError( $result );
-        remove_filter( 'wp_update_comment_data', array( $this, '_wp_update_comment_data_filter' ), 10, 3 );
     }
 

trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -2809 +2809 @@
         $response = rest_get_server()->dispatch( $request );
 
+        remove_filter( 'wp_update_comment_data', array( $this, '_wp_update_comment_data_filter' ), 10, 3 );
+
         $this->assertErrorResponse( 'rest_comment_failed_edit', $response, 500 );
-
-        remove_filter( 'wp_update_comment_data', array( $this, '_wp_update_comment_data_filter' ), 10, 3 );
     }