<!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>[35732] trunk/tests/phpunit/tests/user.php: Users: Move the tests added in [35116] and [35618] to a more appropriate place and give them a better name.</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/35732">35732</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/35732","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-23 18:39:20 +0000 (Mon, 23 Nov 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'>Users: Move the tests added in <a href="https://core.trac.wordpress.org/changeset/35116">[35116]</a> and <a href="https://core.trac.wordpress.org/changeset/35618">[35618]</a> to a more appropriate place and give them a better name.
See <a href="https://core.trac.wordpress.org/ticket/28435">#28435</a>, <a href="https://core.trac.wordpress.org/ticket/29880">#29880</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2015-11-23 17:55:24 UTC (rev 35731)
+++ trunk/tests/phpunit/tests/user.php 2015-11-23 18:39:20 UTC (rev 35732)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,6 +531,20 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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 );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28315
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_user_meta_error() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,6 +701,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( validate_username( '@#&99sd' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @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 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 29696
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,39 +1044,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_new_user_notification( self::$author_id, 'this_is_deprecated' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * @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 );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>