Changeset 46650

Timestamp:

11/04/2019 03:04:41 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Login and Registration: Simplify the test for wp_signon() added in [46640].

Make sure it actually tests the change in behavior, previously it passed both before and after the patch.

Add wp_unslash() to the last remaining instance of $_POST['user_login'] that didn't have it.

See #38744.

Location:

trunk

Files:

• src/wp-login.php (modified) (1 diff)
• tests/phpunit/tests/auth.php (modified) (2 diffs)
• tests/phpunit/tests/user.php (modified) (3 diffs)

trunk/src/wp-login.php

@@ -374 +374 @@
         }
     } else {
-        $login     = trim( $_POST['user_login'] );
+        $login     = trim( wp_unslash( $_POST['user_login'] ) );
         $user_data = get_user_by( 'login', $login );
     }

trunk/tests/phpunit/tests/auth.php

@@ -388 +388 @@
      * @ticket 9568
      */
-    function test_log_in_using_email() {
+    public function test_log_in_using_email() {
         $user_args = array(
             'user_login' => 'johndoe',
@@ -399 +399 @@
         $this->assertInstanceOf( 'WP_User', wp_authenticate( $user_args['user_login'], $user_args['user_pass'] ) );
     }
+
+    /**
+     * @ticket 38744
+     */
+    public function test_wp_signon_using_email_with_an_apostrophe() {
+        $user_args = array(
+            'user_email' => "mail\'@example.com",
+            'user_pass'  => 'password',
+        );
+        $this->factory()->user->create( $user_args );
+
+        $_POST['log'] = $user_args['user_email'];
+        $_POST['pwd'] = $user_args['user_pass'];
+        $this->assertInstanceOf( 'WP_User', wp_signon() );
+    }
+
 }

trunk/tests/phpunit/tests/user.php

@@ -36 +36 @@
         self::$user_ids[] = self::$contrib_id;
 
-        self::$user_ids[] = $factory->user->create(
-            array(
-                'user_login'    => "testemailaddress'@test.com",
-                'user_nicename' => 'user_email_with_apostrophe',
-                'user_pass'     => 'password',
-                'first_name'    => 'John',
-                'last_name'     => 'Doe',
-                'display_name'  => 'John Doe',
-                'user_email'    => "testemailaddress'@test.com",
-                'user_url'      => 'http://tacos.com',
-                'role'          => 'contributor',
-                'nickname'      => 'Johnny',
-                'description'   => 'I am a WordPress user that cares about privacy.',
-            )
-        );
-
         self::$author_id  = $factory->user->create(
             array(
@@ -65 +49 @@
         self::$editor_id  = $factory->user->create(
             array(
+                'user_email' => 'test@test.com',
                 'role'       => 'editor',
-                'user_email' => 'test@test.com',
             )
         );
@@ -80 +64 @@
 
         $this->author = clone self::$_author;
-    }
-
-    public function test_that_you_can_login_with_an_email_that_has_apostrophe() {
-
-        // Create the user with an email that has an apostrophe (see test setup).
-
-        // Login as the user.
-        $credentials = [
-            'user_login'    => "testemailaddress'@test.com",
-            'user_password' => 'password',
-        ];
-
-        // Attempt to login.
-        $user = wp_signon( $credentials );
-
-        // Assert that the login was successfull.
-        // If the login fails, an instance of WP_Error is returned rather than User object.
-        $this->assertNotWPError( $user );
     }