<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[35171] trunk/tests/phpunit/tests: Unit Tests: wrestle performance out of `Tests_Auth` by cloning the same user for a majority of the tests.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35171">35171</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35171","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-15 00:10:45 +0000 (Thu, 15 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Unit Tests: wrestle performance out of `Tests_Auth` by cloning the same user for a majority of the tests.
See <a href="https://core.trac.wordpress.org/ticket/30017">#30017</a>, <a href="https://core.trac.wordpress.org/ticket/33968">#33968</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsauthphp">trunk/tests/phpunit/tests/auth.php</a></li>
<li><a href="#trunktestsphpunitteststermcachephp">trunk/tests/phpunit/tests/term/cache.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsauthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/auth.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/auth.php 2015-10-14 23:43:10 UTC (rev 35170)
+++ trunk/tests/phpunit/tests/auth.php 2015-10-15 00:10:45 UTC (rev 35171)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,50 +5,65 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group auth
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Auth extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $user_id;
- var $wp_hasher;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $user;
+ protected static $_user;
+ protected static $user_id;
+ protected static $wp_hasher;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * action hook
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected $nonce_failure_hook = 'wp_verify_nonce_failed';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static function setUpBeforeClass() {
+ parent::setUpBeforeClass();
+
+ $factory = new WP_UnitTest_Factory();
+
+ self::$_user = $factory->user->create_and_get( array(
+ 'user_login' => 'password-tests'
+ ) );
+
+ self::$user_id = self::$_user->ID;
+
+ require_once( ABSPATH . WPINC . '/class-phpass.php' );
+ self::$wp_hasher = new PasswordHash( 8, true );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->user_id = $this->factory->user->create();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once ABSPATH . WPINC . '/class-phpass.php';
- $this->wp_hasher = new PasswordHash( 8, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->user = clone self::$_user;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_auth_cookie_valid() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cookie = wp_generate_auth_cookie( $this->user_id, time() + 3600, 'auth' );
- $this->assertEquals( $this->user_id, wp_validate_auth_cookie( $cookie, 'auth' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'auth' );
+ $this->assertEquals( self::$user_id, wp_validate_auth_cookie( $cookie, 'auth' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_auth_cookie_invalid() {
</span><span class="cx" style="display: block; padding: 0 10px"> // 3600 or less and +3600 may occur in wp_validate_auth_cookie(),
</span><span class="cx" style="display: block; padding: 0 10px"> // as an ajax test may have defined DOING_AJAX, failing the test.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cookie = wp_generate_auth_cookie( $this->user_id, time() - 7200, 'auth' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cookie = wp_generate_auth_cookie( self::$user_id, time() - 7200, 'auth' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_validate_auth_cookie( $cookie, 'auth' ), 'expired cookie' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cookie = wp_generate_auth_cookie( $this->user_id, time() + 3600, 'auth' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'auth' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_validate_auth_cookie( $cookie, 'logged_in' ), 'wrong auth scheme' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cookie = wp_generate_auth_cookie( $this->user_id, time() + 3600, 'auth' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'auth' );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($a, $b, $c) = explode('|', $cookie);
</span><span class="cx" style="display: block; padding: 0 10px"> $cookie = $a . '|' . ($b + 1) . '|' . $c;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( false, wp_validate_auth_cookie( $this->user_id, 'auth' ), 'altered cookie' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( false, wp_validate_auth_cookie( self::$user_id, 'auth' ), 'altered cookie' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_auth_cookie_scheme() {
</span><span class="cx" style="display: block; padding: 0 10px"> // arbitrary scheme name
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cookie = wp_generate_auth_cookie( $this->user_id, time() + 3600, 'foo' );
- $this->assertEquals( $this->user_id, wp_validate_auth_cookie( $cookie, 'foo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'foo' );
+ $this->assertEquals( self::$user_id, wp_validate_auth_cookie( $cookie, 'foo' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // wrong scheme name - should fail
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cookie = wp_generate_auth_cookie( $this->user_id, time() + 3600, 'foo' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cookie = wp_generate_auth_cookie( self::$user_id, time() + 3600, 'foo' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, wp_validate_auth_cookie( $cookie, 'bar' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,8 +71,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23494
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_password_trimming() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $another_user = $this->factory->user->create( array( 'user_login' => 'password-triming-tests' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $passwords_to_test = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a password with no trailing or leading spaces',
</span><span class="cx" style="display: block; padding: 0 10px"> 'a password with trailing spaces ',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,11 +79,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $passwords_to_test as $password_to_test ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_password( $password_to_test, $another_user );
- $authed_user = wp_authenticate( 'password-triming-tests', $password_to_test );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_password( $password_to_test, $this->user->ID );
+ $authed_user = wp_authenticate( $this->user->user_login, $password_to_test );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User', $authed_user );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $another_user, $authed_user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $this->user->ID, $authed_user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,55 +153,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_password_length_limit() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $passwords = array(
- str_repeat( 'a', 4095 ), // short
- str_repeat( 'a', 4096 ), // limit
- str_repeat( 'a', 4097 ), // long
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $limit = str_repeat( 'a', 4096 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $this->factory->user->create( array( 'user_login' => 'password-length-test' ) );
-
- wp_set_password( $passwords[1], $user_id );
- $user = get_user_by( 'id', $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_password( $limit, self::$user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> // phpass hashed password
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertStringStartsWith( '$P$', $user->data->user_pass );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertStringStartsWith( '$P$', $this->user->data->user_pass );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_authenticate( 'password-length-test', $passwords[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_authenticate( $this->user->user_login, 'aaaaaaaa' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Wrong Password
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_authenticate( 'password-length-test', $passwords[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_authenticate( $this->user->user_login, $limit );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User', $user );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $user_id, $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( self::$user_id, $user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_authenticate( 'password-length-test', $passwords[2] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // one char too many
+ $user = wp_authenticate( $this->user->user_login, $limit . 'a' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Wrong Password
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- wp_set_password( $passwords[2], $user_id );
- $user = get_user_by( 'id', $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_password( $limit . 'a', self::$user_id );
+ $user = get_user_by( 'id', self::$user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Password broken by setting it to be too long.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '*', $user->data->user_pass );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_authenticate( 'password-length-test', '*' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_authenticate( $this->user->user_login, '*' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_authenticate( 'password-length-test', '*0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_authenticate( $this->user->user_login, '*0' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_authenticate( 'password-length-test', '*1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_authenticate( $this->user->user_login, '*1' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_authenticate( 'password-length-test', $passwords[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_authenticate( $this->user->user_login, 'aaaaaaaa' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Wrong Password
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_authenticate( 'password-length-test', $passwords[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_authenticate( $this->user->user_login, $limit );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Wrong Password
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = wp_authenticate( 'password-length-test', $passwords[2] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_authenticate( $this->user->user_login, $limit . 'a' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Password broken by setting it to be too long.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $user );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,29 +206,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_generate_password( 20, false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get();
</del><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->users, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_activation_key' => strtotime( '-1 hour' ) . ':' . $this->wp_hasher->HashPassword( $key ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_activation_key' => strtotime( '-1 hour' ) . ':' . self::$wp_hasher->HashPassword( $key ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ), array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => $user->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => $this->user->ID,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // A valid key should be accepted
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( $key, $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( $key, $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User', $check );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $user->ID, $check->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $this->user->ID, $check->ID );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // An invalid key should be rejected
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( 'key', $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( 'key', $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // An empty key should be rejected
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( '', $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( '', $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // A truncated key should be rejected
</span><span class="cx" style="display: block; padding: 0 10px"> $partial = substr( $key, 0, 10 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( $partial, $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( $partial, $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,15 +238,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_generate_password( 20, false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get();
</del><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->users, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_activation_key' => strtotime( '-48 hours' ) . ':' . $this->wp_hasher->HashPassword( $key ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_activation_key' => strtotime( '-48 hours' ) . ':' . self::$wp_hasher->HashPassword( $key ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ), array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => $user->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => $this->user->ID,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // An expired but otherwise valid key should be rejected
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( $key, $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( $key, $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,16 +253,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32429
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_empty_user_activation_key_fails_key_check() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
- $user = $this->factory->user->create_and_get();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // An empty user_activation_key should not allow any key to be accepted
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( 'key', $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( 'key', $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // An empty user_activation_key should not allow an empty key to be accepted
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( '', $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( '', $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,19 +271,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // A legacy user_activation_key is one without the `time()` prefix introduced in WordPress 4.3.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_generate_password( 20, false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get();
</del><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->users, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_activation_key' => $this->wp_hasher->HashPassword( $key ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_activation_key' => self::$wp_hasher->HashPassword( $key ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ), array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => $user->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => $this->user->ID,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // A legacy user_activation_key should not be accepted
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( $key, $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( $key, $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // An empty key with a legacy user_activation_key should be rejected
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( '', $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( '', $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,19 +296,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // A plaintext user_activation_key is one stored before hashing was introduced in WordPress 3.7.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_generate_password( 20, false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $this->factory->user->create_and_get();
</del><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->users, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_activation_key' => $key,
</span><span class="cx" style="display: block; padding: 0 10px"> ), array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => $user->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => $this->user->ID,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // A plaintext user_activation_key should not allow an otherwise valid key to be accepted
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( $key, $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( $key, $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // A plaintext user_activation_key should not allow an empty key to be accepted
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $check = check_password_reset_key( '', $user->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = check_password_reset_key( '', $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $check );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermcachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/cache.php 2015-10-14 23:43:10 UTC (rev 35170)
+++ trunk/tests/phpunit/tests/term/cache.php 2015-10-15 00:10:45 UTC (rev 35171)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_id = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $children = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( range( 1, 99 ) as $i ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( range( 1, 9 ) as $i ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $step ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 1:
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = wp_insert_term( 'Parent' . $i, $tax );
</span></span></pre>
</div>
</div>
</body>
</html>