Changeset 35244 for trunk/tests/phpunit/tests/user.php

Timestamp:

10/17/2015 07:24:20 PM (9 years ago)

Author:

wonderboymusic

Message:

Unit Tests: WP_UnitTest_Generator_Sequence needs a static incrementer - otherwise, it assumes every test class is a reset, which it no longer is (it is now static).

While we're at it, remove unnecessary tearDown() code.

See #30017, #33968.

File:

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

trunk/tests/phpunit/tests/user.php

@@ -245 +245 @@
 
         foreach ( $roles as $role => $level ) {
-            $user_id = self::factory()->user->create( array( 'role' => $role ) );
+            $user_id = self::factory()->user->create( array(
+                'user_email' => 'user_19265_' . $role . '@burritos.com',
+                'user_login' => 'user_19265_' . $role,
+                'role' => $role
+            ) );
             $user = new WP_User( $user_id );
 
@@ -776 +780 @@
         ) );
 
+        $user1 = new WP_User( $u1 );
+
+        $expected = str_repeat( 'a', 50 );
+        $this->assertSame( $expected, $user1->user_nicename );
+
         $user_login = str_repeat( 'a', 55 );
         $u = wp_insert_user( array(
@@ -784 +793 @@
 
         $this->assertNotEmpty( $u );
-        $user = new WP_User( $u );
+        $user2 = new WP_User( $u );
         $expected = str_repeat( 'a', 48 ) . '-2';
-        $this->assertSame( $expected, $user->user_nicename );
+        $this->assertSame( $expected, $user2->user_nicename );
     }
 
@@ -793 +802 @@
      */
     public function test_wp_insert_user_should_not_truncate_to_a_duplicate_user_nicename_when_suffix_has_more_than_one_character() {
-        $users = self::factory()->user->create_many( 4, array(
+        $user_ids = self::factory()->user->create_many( 4, array(
             'user_nicename' => str_repeat( 'a', 50 ),
         ) );
+
+        foreach ( $user_ids as $i => $user_id ) {
+            $user = new WP_User( $user_id );
+            if ( 0 === $i ) {
+                $expected = str_repeat( 'a', 50 );
+            } else {
+                $expected = str_repeat( 'a', 48 ) . '-' . ( $i + 1 );
+            }
+            $this->assertSame( $expected, $user->user_nicename );
+        }
 
         $user_login = str_repeat( 'a', 55 );