Changeset 12246 for trunk/tests/phpunit/testcases/core/caps.php

Timestamp:

10/05/2018 05:24:17 PM (7 years ago)

Author:

boonebgorges

Message:

Tests: Move wpmu_new_blog and delete_blog expectedDeprecated calls into test logic.

Use of the @expectedDeprecated annotation means that the deprecation notice is
expected across all versions of WordPress, while we in fact need to suppress the
notices only on WP 5.0+.

See #7984.

File:

• trunk/tests/phpunit/testcases/core/caps.php (modified) (2 diffs)

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

@@ -6 +6 @@
  */
 class BP_Tests_Core_Caps extends BP_UnitTestCase {
-    /**
-     * @expectedDeprecated wpmu_new_blog
-     */
     public function test_bp_current_user_can_should_interpret_integer_second_param_as_a_blog_id() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }
 
@@ -30 +31 @@
     /**
      * @ticket BP6501
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_current_user_can_should_respect_blog_id_passed_in_args_array() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
         }