Changeset 35732

Timestamp:

11/23/2015 06:39:20 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Users: Move the tests added in [35116] and [35618] to a more appropriate place and give them a better name.

See #28435, #29880.

File:

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

trunk/tests/phpunit/tests/user.php

@@ -532 +532 @@
 
     /**
+     * @ticket 28435
+     */
+    function test_wp_update_user_should_not_change_password_when_passed_WP_User_instance() {
+        $testuserid = 1;
+        $user = get_userdata( $testuserid );
+        $pwd_before = $user->user_pass;
+        wp_update_user( $user );
+
+        // Reload the data
+        $pwd_after = get_userdata( $testuserid )->user_pass;
+        $this->assertEquals( $pwd_before, $pwd_after );
+    }
+
+    /**
      * @ticket 28315
      */
@@ -686 +700 @@
     public function test_validate_username_invalid() {
         $this->assertFalse( validate_username( '@#&99sd' ) );
+    }
+
+    /**
+     * @ticket 29880
+     */
+    public function test_wp_insert_user_should_not_wipe_existing_password() {
+        $user_details = array(
+            'user_login' => rand_str(),
+            'user_pass' => 'password',
+            'user_email' => rand_str() . '@example.com',
+        );
+
+        $user_id = wp_insert_user( $user_details );
+        $this->assertEquals( $user_id, email_exists( $user_details['user_email'] ) );
+
+        // Check that providing an empty password doesn't remove a user's password.
+        $user_details['ID'] = $user_id;
+        $user_details['user_pass'] = '';
+
+        $user_id = wp_insert_user( $user_details );
+        $user = WP_User::get_data_by( 'id', $user_id );
+        $this->assertNotEmpty( $user->user_pass );
     }
 
@@ -1009 +1045 @@
     }
 
-    /**
-     * @ticket 28435
-     */
-    function test_wp_update_user_no_change_pwd() {
-        $testuserid = 1;
-        $user = get_userdata( $testuserid );
-        $pwd_before = $user->user_pass;
-        wp_update_user( $user );
-
-        // Reload the data
-        $pwd_after = get_userdata( $testuserid )->user_pass;
-        $this->assertEquals( $pwd_before, $pwd_after );
-    }
-
-    /**
-     * @ticket 29880
-     */
-    function test_wp_insert_user() {
-        $user_details = array(
-            'user_login' => rand_str(),
-            'user_pass' => 'password',
-            'user_email' => rand_str() . '@example.com',
-        );
-        $id1 = wp_insert_user( $user_details );
-        $this->assertEquals( $id1, email_exists( $user_details['user_email'] ) );
-
-        // Check that providing an empty password doesn't remove a user's password.
-        // See ticket #29880
-        $user_details['ID'] = $id1;
-        $user_details['user_pass'] = '';
-        $id1 = wp_insert_user( $user_details );
-        $user = WP_User::get_data_by( 'id', $id1 );
-        $this->assertNotEmpty( $user->user_pass );
-    }
-
 }