Changeset 12245

Timestamp:

10/05/2018 04:44:54 PM (6 years ago)

Author:

boonebgorges

Message:

Tests: More targeted 'wpmu_new_blog' deprecation notices.

When a test could run under non-MS, the expectedDeprecated annotation
cannot apply to the entire test.

See #7984.

Location:

trunk/tests/phpunit/testcases

Files:

• activity/functions.php (modified) (1 diff)
• blogs/functions.php (modified) (2 diffs)
• core/functions.php (modified) (2 diffs)
• members/functions.php (modified) (2 diffs)
• routing/url.php (modified) (2 diffs)

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

@@ -1053 +1053 @@
      * @group bp_activity_format_activity_action_custom_post_type_post_ms
      * @group post_type_comment_activities
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_activity_format_activity_action_custom_post_type_comment() {
         if ( is_multisite() ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
             $b = self::factory()->blog->create();
             switch_to_blog( $b );

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

@@ -734 +734 @@
         if ( ! is_multisite() ) {
             $this->markTestSkipped();
-            return;
         }
 
@@ -886 +885 @@
      * @group bp_blogs_comment_sync_activity_comment
      * @group post_type_comment_activities
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_blogs_comment_sync_activity_comment_for_custom_post_type() {
         if ( is_multisite() ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
             $b = self::factory()->blog->create();
             switch_to_blog( $b );

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

@@ -696 +696 @@
      * @group bp_attachments
      * @group bp_upload_dir
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_upload_dir() {
@@ -702 +701 @@
 
         if ( is_multisite() ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
             $b = self::factory()->blog->create();
             switch_to_blog( $b );

trunk/tests/phpunit/testcases/members/functions.php

@@ -496 +496 @@
     /**
      * @group bp_core_activate_signup
-     * @expectedDeprecated wpmu_new_blog
      */
     public function test_bp_core_activate_signup_password() {
@@ -517 +516 @@
 
         if ( is_multisite() ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
+
             $signups['ms-blog'] = array( 'signup_id' => self::factory()->signup->create( array(
                     'user_login'     => 'msblog',

trunk/tests/phpunit/testcases/routing/url.php

@@ -4 +4 @@
  */
 class BP_Tests_URL extends BP_UnitTestCase {
-    /**
-     * @expectedDeprecated wpmu_new_blog
-     */
     function test_bp_core_ajax_url() {
         $forced = force_ssl_admin();
@@ -45 +42 @@
         // (3) Multisite, root blog other than 1
         if ( is_multisite() ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
+
             $original_root_blog = bp_get_root_blog_id();
             $blog_id = self::factory()->blog->create( array(