<!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>[36047] trunk/tests/phpunit/tests/user/capabilities.php: Tests: Shave a second off the user capability tests by reusing its user fixtures.</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/36047">36047</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/36047","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-12-21 06:56:57 +0000 (Mon, 21 Dec 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'>Tests: Shave a second off the user capability tests by reusing its user fixtures.
See <a href="https://core.trac.wordpress.org/ticket/30017">#30017</a>, <a href="https://core.trac.wordpress.org/ticket/32394">#32394</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsusercapabilitiesphp"></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/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php 2015-12-21 05:49:42 UTC (rev 36046)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2015-12-21 06:56:57 UTC (rev 36047)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,14 +7,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group capabilities
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_User_Capabilities extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $user_ids = array();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $users = array();
+
+ public static function wpSetUpBeforeClass( $factory ) {
+ self::$users = array(
+ 'administrator' => $factory->user->create_and_get( array( 'role' => 'administrator' ) ),
+ 'editor' => $factory->user->create_and_get( array( 'role' => 'editor' ) ),
+ 'author' => $factory->user->create_and_get( array( 'role' => 'author' ) ),
+ 'contributor' => $factory->user->create_and_get( array( 'role' => 'contributor' ) ),
+ 'subscriber' => $factory->user->create_and_get( array( 'role' => 'subscriber' ) ),
+ );
+ }
+
</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><span class="cx" style="display: block; padding: 0 10px"> // keep track of users we create
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_flush_roles();
</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->orig_users = get_users();
</del><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 _flush_roles() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,13 +243,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // test the tests
</span><span class="cx" style="display: block; padding: 0 10px"> function test_all_caps_of_users_are_being_tested() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = array(
- 'administrator' => self::factory()->user->create_and_get( array( 'role' => 'administrator' ) ),
- 'editor' => self::factory()->user->create_and_get( array( 'role' => 'editor' ) ),
- 'author' => self::factory()->user->create_and_get( array( 'role' => 'author' ) ),
- 'contributor' => self::factory()->user->create_and_get( array( 'role' => 'contributor' ) ),
- 'subscriber' => self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) ),
- );
</del><span class="cx" style="display: block; padding: 0 10px"> $caps = $this->getCapsAndRoles();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // `manage_links` is a special case
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +250,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // `unfiltered_upload` is a special case
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( defined( 'ALLOW_UNFILTERED_UPLOADS' ) );
</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 ( $users as $role => $user ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$users as $role => $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the user is valid
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists(), "User with {$role} role does not exist" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,16 +274,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // test the default roles and caps
</span><span class="cx" style="display: block; padding: 0 10px"> function test_all_roles_and_caps() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = array(
- 'administrator' => self::factory()->user->create_and_get( array( 'role' => 'administrator' ) ),
- 'editor' => self::factory()->user->create_and_get( array( 'role' => 'editor' ) ),
- 'author' => self::factory()->user->create_and_get( array( 'role' => 'author' ) ),
- 'contributor' => self::factory()->user->create_and_get( array( 'role' => 'contributor' ) ),
- 'subscriber' => self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) ),
- );
</del><span class="cx" style="display: block; padding: 0 10px"> $caps = $this->getCapsAndRoles();
</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 ( $users as $role => $user ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$users as $role => $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the user is valid
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists(), "User with {$role} role does not exist" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,13 +303,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // special case for the link manager
</span><span class="cx" style="display: block; padding: 0 10px"> function test_link_manager_caps() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = array(
- 'administrator' => self::factory()->user->create_and_get( array( 'role' => 'administrator' ) ),
- 'editor' => self::factory()->user->create_and_get( array( 'role' => 'editor' ) ),
- 'author' => self::factory()->user->create_and_get( array( 'role' => 'author' ) ),
- 'contributor' => self::factory()->user->create_and_get( array( 'role' => 'contributor' ) ),
- 'subscriber' => self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) ),
- );
</del><span class="cx" style="display: block; padding: 0 10px"> $caps = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'manage_links' => array( 'administrator', 'editor' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '0', get_option( 'link_manager_enabled' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // no-one should have access to the link manager by default
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $users as $role => $user ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$users as $role => $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $caps as $cap => $roles ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $user->has_cap( $cap ), "User with the {$role} role should not have the {$cap} capability" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( $user, $cap ), "User with the {$role} role should not have the {$cap} capability" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'link_manager_enabled', '1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '1', get_option( 'link_manager_enabled' ) );
</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 ( $users as $role => $user ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$users as $role => $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $caps as $cap => $roles ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $role, $roles, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->has_cap( $cap ), "User with the {$role} role should have the {$cap} capability" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,18 +339,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // special case for unfiltered uploads
</span><span class="cx" style="display: block; padding: 0 10px"> function test_unfiltered_upload_caps() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = array(
- 'administrator' => self::factory()->user->create_and_get( array( 'role' => 'administrator' ) ),
- 'editor' => self::factory()->user->create_and_get( array( 'role' => 'editor' ) ),
- 'author' => self::factory()->user->create_and_get( array( 'role' => 'author' ) ),
- 'contributor' => self::factory()->user->create_and_get( array( 'role' => 'contributor' ) ),
- 'subscriber' => self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) ),
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( defined( 'ALLOW_UNFILTERED_UPLOADS' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // no-one should have this cap
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $users as $role => $user ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$users as $role => $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $user->has_cap( 'unfiltered_upload' ), "User with the {$role} role should not have the unfiltered_upload capability" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( $user, 'unfiltered_upload' ), "User with the {$role} role should not have the unfiltered_upload capability" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +356,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $caps = $this->getCapsAndRoles();
</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 = self::factory()->user->create_and_get( array( 'role' => 'administrator' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$users['administrator'];
</ins><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_super_admin( $user->ID ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,7 +394,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // a user with multiple roles
</span><span class="cx" style="display: block; padding: 0 10px"> function test_user_subscriber_contributor() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$users['subscriber'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the user is valid
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user->exists(), "User does not exist" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,6 +415,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( $user, $cap ), "User should not have the {$cap} capability" );
</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">+
+ $user->remove_role( 'contributor' );
+ // user should have one role now
+ $this->assertEquals( array( 'subscriber' ), $user->roles );
+
</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"> // newly added empty role
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,8 +705,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_meta_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> // simple tests for some common meta capabilities
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make our author
- $author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get our author
+ $author = self::$users['author'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make a post
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create( array( 'post_author' => $author->ID, 'post_type' => 'post' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -809,8 +795,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create( array( 'post_author' => 0, 'post_type' => 'post', 'post_status' => $status ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add an editor and contributor
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = self::factory()->user->create_and_get( array( 'role' => 'editor' ) );
- $contributor = self::factory()->user->create_and_get( array( 'role' => 'contributor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = self::$users['editor'];
+ $contributor = self::$users['contributor'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // editor can edit, view, and trash
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $editor->has_cap( 'edit_post', $post ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -891,8 +877,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_page_meta_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> // simple tests for some common meta capabilities
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make our author
- $author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get our author
+ $author = self::$users['author'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make a page
</span><span class="cx" style="display: block; padding: 0 10px"> $page = self::factory()->post->create( array( 'post_author' => $author->ID, 'post_type' => 'page' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -901,10 +887,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue($author->exists(), "Problem getting user " . $author->ID);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // add some other users
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$users['administrator'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_2 = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = new WP_User( self::factory()->user->create( array( 'role' => 'editor' ) ) );
- $contributor = new WP_User( self::factory()->user->create( array( 'role' => 'contributor' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor = self::$users['editor'];
+ $contributor = self::$users['contributor'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // administrators, editors and the post owner can edit it
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue($admin->has_cap('edit_page', $page));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1019,7 +1005,7 @@
</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_subscriber_cant_edit_posts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = new WP_User( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$users['subscriber'];
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::factory()->post->create( array( 'post_author' => 1 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1034,8 +1020,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
- $other_user = new WP_User( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$users['administrator'];
+ $other_user = self::$users['subscriber'];
</ins><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 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1048,7 +1034,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = self::$users['administrator'];
</ins><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 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1061,9 +1047,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_contributor_cannot_edit_scheduled_post() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a contributor
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contributor = $this->factory->user->create_and_get( array(
- 'role' => 'contributor',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $contributor = self::$users['contributor'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Give them a scheduled post
</span><span class="cx" style="display: block; padding: 0 10px"> $post = $this->factory->post->create_and_get( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1128,8 +1112,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_type' => 'existed' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_post_type( 'existed' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subscriber_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
- $editor_id = self::factory()->user->create( array( 'role' => 'editor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subscriber_id = self::$users['subscriber']->ID;
+ $editor_id = self::$users['editor']->ID;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->setExpectedIncorrectUsage( 'map_meta_cap' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'delete_post', 'edit_post', 'read_post', 'publish_post' ) as $cap ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1154,10 +1138,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cpt = get_post_type_object( 'page_capability' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin = self::factory()->user->create_and_get( array( 'role' => 'administrator' ) );
- $editor = self::factory()->user->create_and_get( array( 'role' => 'editor' ) );
- $author = self::factory()->user->create_and_get( array( 'role' => 'author' ) );
- $contributor = self::factory()->user->create_and_get( array( 'role' => 'contributor' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin = self::$users['administrator'];
+ $editor = self::$users['editor'];
+ $author = self::$users['author'];
+ $contributor = self::$users['contributor'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'edit_pages', $cpt->cap->edit_posts );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( $admin->ID, $cpt->cap->edit_posts ) );
</span></span></pre>
</div>
</div>
</body>
</html>