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

Timestamp:

02/17/2023 10:13:36 AM (20 months ago)

Author:

SergeyBiryukov

Message:

Users: Correct the error code in wp_insert_user() when login matches an existing email.

Move the test next to the other tests for user_login.

Follow-up to [55358].

See #57394.

File:

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

trunk/tests/phpunit/tests/user.php

@@ -899 +899 @@
 
     /**
+     * @ticket 57394
+     */
+    public function test_wp_insert_user_should_reject_user_login_that_matches_existing_user_email() {
+        $existing_email = get_option( 'admin_email' );
+        $user_id        = wp_insert_user(
+            array(
+                'user_login'    => $existing_email,
+                'user_email'    => 'whatever@example.com',
+                'user_pass'     => 'whatever',
+                'user_nicename' => 'whatever',
+            )
+        );
+
+        $this->assertWPError( $user_id );
+        $this->assertSame( 'existing_user_email_as_login', $user_id->get_error_code() );
+    }
+
+    /**
      * @ticket 33793
      */
@@ -933 +951 @@
         $expected = str_repeat( 'a', 50 );
         $this->assertSame( $expected, $user->user_nicename );
-    }
-
-    /**
-     * @ticket 57394
-     */
-    public function test_wp_insert_user_should_reject_username_that_matches_existing_user_email() {
-        $existing_email = get_option( 'admin_email' );
-        $username       = wp_insert_user(
-            array(
-                'user_login'    => $existing_email,
-                'user_email'    => 'whatever@example.com',
-                'user_pass'     => 'whatever',
-                'user_nicename' => 'whatever',
-            )
-        );
-
-        $this->assertWPError( $username );
-        $this->assertSame( 'existing_user_login_as_email', $username->get_error_code() );
     }