<!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>[35247] trunk/tests/phpunit/tests/user.php: Unit Tests: better fixtures for `Tests_User`.</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/35247">35247</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/35247","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-17 21:14:28 +0000 (Sat, 17 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: better fixtures for `Tests_User`.
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="#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-10-17 20:48:33 UTC (rev 35246)
+++ trunk/tests/phpunit/tests/user.php 2015-10-17 21:14:28 UTC (rev 35247)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,14 +5,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group user
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_User extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected static $test_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $admin_id;
+ protected static $editor_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> protected static $author_id;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $contrib_id;
+ protected static $sub_id;
+
+ protected static $user_ids = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> protected static $_author;
</span><span class="cx" style="display: block; padding: 0 10px"> protected $author;
</span><span class="cx" style="display: block; padding: 0 10px"> protected $user_data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$test_id = $factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$user_ids[] = self::$contrib_id = $factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'user1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_nicename' => 'userone',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_pass' => 'password',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,15 +26,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_name' => 'Doe',
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'John Doe',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'blackburn@battlefield3.com',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_url' => 'http://tacos.com'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_url' => 'http://tacos.com',
+ 'role' => 'contributor'
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$author_id = $factory->user->create( array( 'role' => 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ self::$user_ids[] = self::$author_id = $factory->user->create( array(
+ 'user_login' => 'author_login',
+ 'user_email' => 'author@email.com',
+ 'role' => 'author'
+ ) );
+
+ self::$user_ids[] = self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
+ self::$user_ids[] = self::$editor_id = $factory->user->create( array(
+ 'role' => 'editor',
+ 'user_email' => 'test@test.com',
+ ) );
+ self::$user_ids[] = self::$sub_id = $factory->user->create( array( 'role' => 'subscriber' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$_author = get_user_by( 'ID', self::$author_id );
</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"> public static function wpTearDownAfterClass() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids = array( self::$test_id, self::$author_id );
- foreach ( $ids as $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$user_ids as $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( $id );
</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">@@ -41,11 +60,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_users_of_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> // add one of each user role
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nusers = array();
- foreach ( array('administrator', 'editor', 'author', 'contributor', 'subscriber' ) as $role ) {
- $id = self::factory()->user->create( array( 'role' => $role ) );
- $nusers[ $id ] = $id;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nusers = array(
+ self::$contrib_id,
+ self::$author_id,
+ self::$admin_id,
+ self::$editor_id,
+ self::$sub_id,
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_list = get_users();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,13 +74,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $user_list as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // only include the users we just created - there might be some others that existed previously
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $nusers[$user->ID] ) ) {
- $found[ $user->ID] = $user->ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $user->ID, $nusers ) ) {
+ $found[] = $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="cx" style="display: block; padding: 0 10px"> // make sure every user we created was returned
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals($nusers, $found);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( $nusers, $found );
</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"> // simple get/set tests for user_option functions
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,15 +257,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_user_level_property_back_compat() {
</span><span class="cx" style="display: block; padding: 0 10px"> $roles = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'administrator' => 10,
- 'editor' => 7,
- 'author' => 2,
- 'contributor' => 1,
- 'subscriber' => 0,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$admin_id => 10,
+ self::$editor_id => 7,
+ self::$author_id => 2,
+ self::$contrib_id => 1,
+ self::$sub_id => 0,
</ins><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">- foreach ( $roles as $role => $level ) {
- $user_id = self::factory()->user->create( array( 'role' => $role ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $roles as $user_id => $level ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $user->user_level ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,86 +312,63 @@
</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_get() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = self::factory()->user->create( array(
- 'role' => 'author',
- 'user_login' => 'test_wp_user_get',
- 'user_pass' => 'password',
- 'user_email' => 'test@test.com',
- ) );
-
- $user = new WP_User( $user_id );
- $this->assertEquals( 'test_wp_user_get', $user->get( 'user_login' ) );
- $this->assertEquals( 'test@test.com', $user->get( 'user_email' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$author_id );
+ $this->assertEquals( 'author_login', $user->get( 'user_login' ) );
+ $this->assertEquals( 'author@email.com', $user->get( 'user_email' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $user->get( 'use_ssl' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', $user->get( 'field_that_does_not_exist' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_meta( $user_id, 'dashed-key', 'abcdefg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$author_id, 'dashed-key', 'abcdefg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'abcdefg', $user->get( 'dashed-key' ) );
</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_has_prop() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = self::factory()->user->create( array(
- 'role' => 'author',
- 'user_login' => 'test_wp_user_has_prop',
- 'user_pass' => 'password',
- 'user_email' => 'test2@test.com',
- ) );
-
- $user = new WP_User( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$author_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->has_prop( 'user_email') );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->has_prop( 'use_ssl' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $user->has_prop( 'field_that_does_not_exist' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_meta( $user_id, 'dashed-key', 'abcdefg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$author_id, 'dashed-key', 'abcdefg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->has_prop( 'dashed-key' ) );
</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_update_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = self::factory()->user->create( array(
- 'role' => 'author',
- 'user_login' => 'test_wp_update_user',
- 'user_pass' => 'password',
- 'user_email' => 'test3@test.com',
- ) );
- $user = new WP_User( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$author_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">- update_user_meta( $user_id, 'description', 'about me' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$author_id, 'description', 'about me' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'about me', $user->get( 'description' ) );
</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_data = array( 'ID' => $user_id, 'display_name' => 'test user' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_data = array( 'ID' => self::$author_id, 'display_name' => 'test user' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_user( $user_data );
</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 = new WP_User( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$author_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'test user', $user->get( 'display_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure there is no collateral damage to fields not in $user_data
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'about me', $user->get( 'description' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Pass as stdClass
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_data = array( 'ID' => $user_id, 'display_name' => 'a test user' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_data = array( 'ID' => self::$author_id, 'display_name' => 'a test user' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_user( (object) $user_data );
</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 = new WP_User( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$author_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'a test user', $user->get( 'display_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Pass as WP_User
- $user = new WP_User( $user_id );
</del><span class="cx" style="display: block; padding: 0 10px"> $user->display_name = 'some test user';
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_user( $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 = new WP_User( $user_id );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'some test user', $user->get( 'display_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test update of fields in _get_additional_user_keys()
</span><span class="cx" style="display: block; padding: 0 10px"> $user_data = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => $user_id, 'use_ssl' => 1, 'show_admin_bar_front' => 1,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => self::$author_id, 'use_ssl' => 1, 'show_admin_bar_front' => 1,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'rich_editing' => 1, 'first_name' => 'first', 'last_name' => 'last',
</span><span class="cx" style="display: block; padding: 0 10px"> 'nickname' => 'nick', 'comment_shortcuts' => 'true', 'admin_color' => 'classic',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'describe'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_user( $user_data );
</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 = new WP_User( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new WP_User( self::$author_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $user_data as $key => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $value, $user->get( $key ), $key );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,12 +380,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_global_userdata() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $userdata, $wpdb;
</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_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
- wp_set_current_user( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$sub_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $userdata );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User', $userdata );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $userdata->ID, $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $userdata->ID, self::$sub_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $prefix = $wpdb->get_blog_prefix();
</span><span class="cx" style="display: block; padding: 0 10px"> $cap_key = $prefix . 'capabilities';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $userdata->$cap_key ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,28 +493,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21431
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_count_many_users_posts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id_a = self::factory()->user->create( array( 'role' => 'author' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> $user_id_b = self::factory()->user->create( array( 'role' => 'author' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id_a = self::factory()->post->create( array( 'post_author' => $user_id_a ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id_a = self::factory()->post->create( array( 'post_author' => self::$author_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id_b = self::factory()->post->create( array( 'post_author' => $user_id_b ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id_c = self::factory()->post->create( array( 'post_author' => $user_id_b, 'post_status' => 'private' ) );
</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_current_user( $user_id_a );
- $counts = count_many_users_posts( array( $user_id_a, $user_id_b), 'post', false );
- $this->assertEquals( 1, $counts[$user_id_a] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$author_id );
+ $counts = count_many_users_posts( array( self::$author_id, $user_id_b ), 'post', false );
+ $this->assertEquals( 1, $counts[self::$author_id] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $counts[$user_id_b] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $counts = count_many_users_posts( array( $user_id_a, $user_id_b), 'post', true );
- $this->assertEquals( 1, $counts[$user_id_a] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $counts = count_many_users_posts( array( self::$author_id, $user_id_b ), 'post', true );
+ $this->assertEquals( 1, $counts[self::$author_id] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $counts[$user_id_b] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user_id_b );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $counts = count_many_users_posts( array( $user_id_a, $user_id_b), 'post', false );
- $this->assertEquals( 1, $counts[$user_id_a] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $counts = count_many_users_posts( array( self::$author_id, $user_id_b ), 'post', false );
+ $this->assertEquals( 1, $counts[self::$author_id] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $counts[$user_id_b] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $counts = count_many_users_posts( array( $user_id_a, $user_id_b), 'post', true );
- $this->assertEquals( 1, $counts[$user_id_a] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $counts = count_many_users_posts( array( self::$author_id, $user_id_b ), 'post', true );
+ $this->assertEquals( 1, $counts[self::$author_id] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $counts[$user_id_b] );
</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">@@ -859,73 +854,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_search_users_login() {
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array( 'search' => 'user1', 'fields' => 'ID' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$test_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( self::$contrib_id, $users ) );
</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"> public function test_search_users_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array( 'search' => '*tacos*', 'fields' => 'ID' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$test_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( self::$contrib_id, $users ) );
</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"> public function test_search_users_email() {
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array( 'search' => '*battle*', 'fields' => 'ID' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$test_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( self::$contrib_id, $users ) );
</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"> public function test_search_users_nicename() {
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array( 'search' => '*one*', 'fields' => 'ID' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$test_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( self::$contrib_id, $users ) );
</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"> public function test_search_users_display_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array( 'search' => '*Doe*', 'fields' => 'ID' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( in_array( self::$test_id, $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( self::$contrib_id, $users ) );
</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="cx" style="display: block; padding: 0 10px"> * @ticket 32158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_email_case() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Create a test user with a lower-case email address.
- $user_id = self::factory()->user->create( array(
- 'user_email' => 'test@test.com',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Alter the case of the email address (which stays the same).
</span><span class="cx" style="display: block; padding: 0 10px"> $userdata = 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' => self::$editor_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'test@TEST.com',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $update = wp_update_user( $userdata );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $user_id, $update );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( self::$editor_id, $update );
</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="cx" style="display: block; padding: 0 10px"> * @ticket 32158
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_email_change() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Create a test user.
- $user_id = self::factory()->user->create( array(
- 'user_email' => 'test@test.com',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Change the email address.
</span><span class="cx" style="display: block; padding: 0 10px"> $userdata = 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' => self::$editor_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'test2@test.com',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $update = wp_update_user( $userdata );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Was this successful?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $user_id, $update );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( self::$editor_id, $update );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify that the email address has been updated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = get_userdata( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = get_userdata( self::$editor_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $user->user_email, 'test2@test.com' );
</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">@@ -941,7 +926,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $was_admin_email_sent = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $was_user_email_sent = false;
</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_new_user_notification( self::$test_id, null, $notify );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_new_user_notification( self::$contrib_id, null, $notify );
</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"> * Check to see if a notification email was sent to the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,14 +983,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated wp_new_user_notification
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_new_user_notification_old_signature_throws_deprecated_warning() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = self::factory()->user->create( array(
- 'role' => 'author',
- 'user_login' => 'test_wp_new_user_notification',
- 'user_pass' => 'password',
- 'user_email' => 'test@test.com',
- ) );
-
- wp_new_user_notification( $user, 'this_is_deprecated' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_new_user_notification( self::$author_id, 'this_is_deprecated' );
</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></pre>
</div>
</div>
</body>
</html>