Changeset 47013 for trunk/tests/phpunit/tests/user/multisite.php

Timestamp:

12/25/2019 09:39:46 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Tests: Update legacy arguments passed to WP_UnitTest_Factory_For_Blog::create_object().

This converts the arguments originally meant for wpmu_create_blog() to the ones used by wp_insert_site().

Follow-up to [47011].

Fixes #47195.

File:

• trunk/tests/phpunit/tests/user/multisite.php (modified) (2 diffs)

trunk/tests/phpunit/tests/user/multisite.php

@@ -123 +123 @@
                         $this->assertTrue( is_blog_user( get_current_blog_id() ) );
 
-                        $blog_ids = array();
-
-                        $blog_ids = self::factory()->blog->create_many( 1 );
-                        foreach ( $blog_ids as $blog_id ) {
-                                $this->assertInternalType( 'int', $blog_id );
-                                $this->assertTrue( is_blog_user( $blog_id ) );
-                                $this->assertTrue( remove_user_from_blog( $user1_id, $blog_id ) );
-                                $this->assertFalse( is_blog_user( $blog_id ) );
-                        }
+                        $blog_id = self::factory()->blog->create( array( 'user_id' => get_current_user_id() ) );
+
+                        $this->assertInternalType( 'int', $blog_id );
+                        $this->assertTrue( is_blog_user( $blog_id ) );
+                        $this->assertTrue( remove_user_from_blog( $user1_id, $blog_id ) );
+                        $this->assertFalse( is_blog_user( $blog_id ) );
 
                         wp_set_current_user( $old_current );
@@ -158 +155 @@
                         $this->assertTrue( is_user_member_of_blog( $user1_id, $site_id ) );
 
-                        $blog_ids = self::factory()->blog->create_many( 1 );
-                        foreach ( $blog_ids as $blog_id ) {
-                                $this->assertInternalType( 'int', $blog_id );
-
-                                // Current user gets added to new blogs
-                                $this->assertTrue( is_user_member_of_blog( $user1_id, $blog_id ) );
-                                // Other users should not
-                                $this->assertFalse( is_user_member_of_blog( $user2_id, $blog_id ) );
-
-                                switch_to_blog( $blog_id );
-
-                                $this->assertTrue( is_user_member_of_blog( $user1_id ) );
-                                $this->assertFalse( is_user_member_of_blog( $user2_id ) );
-
-                                // Remove user 1 from blog
-                                $this->assertTrue( remove_user_from_blog( $user1_id, $blog_id ) );
-
-                                // Add user 2 to blog
-                                $this->assertTrue( add_user_to_blog( $blog_id, $user2_id, 'subscriber' ) );
-
-                                $this->assertFalse( is_user_member_of_blog( $user1_id ) );
-                                $this->assertTrue( is_user_member_of_blog( $user2_id ) );
-
-                                restore_current_blog();
-
-                                $this->assertFalse( is_user_member_of_blog( $user1_id, $blog_id ) );
-                                $this->assertTrue( is_user_member_of_blog( $user2_id, $blog_id ) );
-                        }
+                        $blog_id = self::factory()->blog->create( array( 'user_id' => get_current_user_id() ) );
+
+                        $this->assertInternalType( 'int', $blog_id );
+
+                        // Current user gets added to new blogs
+                        $this->assertTrue( is_user_member_of_blog( $user1_id, $blog_id ) );
+                        // Other users should not
+                        $this->assertFalse( is_user_member_of_blog( $user2_id, $blog_id ) );
+
+                        switch_to_blog( $blog_id );
+
+                        $this->assertTrue( is_user_member_of_blog( $user1_id ) );
+                        $this->assertFalse( is_user_member_of_blog( $user2_id ) );
+
+                        // Remove user 1 from blog
+                        $this->assertTrue( remove_user_from_blog( $user1_id, $blog_id ) );
+
+                        // Add user 2 to blog
+                        $this->assertTrue( add_user_to_blog( $blog_id, $user2_id, 'subscriber' ) );
+
+                        $this->assertFalse( is_user_member_of_blog( $user1_id ) );
+                        $this->assertTrue( is_user_member_of_blog( $user2_id ) );
+
+                        restore_current_blog();
+
+                        $this->assertFalse( is_user_member_of_blog( $user1_id, $blog_id ) );
+                        $this->assertTrue( is_user_member_of_blog( $user2_id, $blog_id ) );
 
                         wpmu_delete_user( $user1_id );