<!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>[35193] trunk/tests/phpunit/tests/post/revisions.php: Unit Tests: upgrade the fixtures in `Tests_Post_Revisions`.</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/35193">35193</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/35193","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 06:31:16 +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: upgrade the fixtures in `Tests_Post_Revisions`.
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="#trunktestsphpunittestspostrevisionsphp">trunk/tests/phpunit/tests/post/revisions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestspostrevisionsphp"></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/post/revisions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/revisions.php 2015-10-15 05:56:47 UTC (rev 35192)
+++ trunk/tests/phpunit/tests/post/revisions.php 2015-10-15 06:31:16 UTC (rev 35193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group revision
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Post_Revisions extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $admin_user_id;
+ protected static $editor_user_id;
+ protected static $author_user_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $factory ) {
+ self::$admin_user_id = $factory->user->create( array( 'role' => 'administrator' ) );
+ self::$editor_user_id = $factory->user->create( array( 'role' => 'editor' ) );
+ self::$author_user_id = $factory->user->create( array( 'role' => 'author' ) );
+ }
+
+ public static function wpTearDownAfterClass() {
+ $ids = array( self::$admin_user_id, self::$editor_user_id, self::$author_user_id );
+ foreach ( $ids as $id ) {
+ if ( is_multisite() ) {
+ wpmu_delete_user( $id );
+ } else {
+ wp_delete_user( $id );
+ }
+ }
+ }
+
</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"> $this->post_type = rand_str( 20 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,37 +42,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16215
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_restore_updates_edit_last_post_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
- $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
- $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> //create a post as Author
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $author_user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$author_user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_default_post_to_edit( 'post', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $post->ID;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_status' => 'draft', 'post_content' => 'I cant spel werds.', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //update post as Editor
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $editor_user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$editor_user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'The Editor was in fixing your typos.', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //restore back as Admin
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $admin_user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$admin_user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $revisions );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $lastrevision = end( $revisions );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'I cant spel werds.', $lastrevision->post_content );
</span><span class="cx" style="display: block; padding: 0 10px"> // #16215
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $author_user_id , $lastrevision->post_author);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( self::$author_user_id , $lastrevision->post_author);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_restore_post_revision( $lastrevision->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //is post_meta correctly set to revision author
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $admin_user_id, get_post_meta( $post_id, '_edit_last', true ) ); //after restoring user
-
- wp_set_current_user( 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( self::$admin_user_id, get_post_meta( $post_id, '_edit_last', true ) ); //after restoring 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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,23 +148,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_view_caps_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
- $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
-
- $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => $editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $revisions );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $editor_user_id, 'read_post', $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->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"> // Author should be able to view the revisions fine
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->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">@@ -159,21 +170,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_restore_caps_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
- $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
-
- $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => $editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $revisions );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $editor_user_id, 'edit_post', $revision->post_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'edit_post', $revision->post_parent ) );
</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"> // Author shouldn't be able to restore the revisions
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( user_can( $author_user_id, 'edit_post', $revision->post_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( user_can( self::$author_user_id, 'edit_post', $revision->post_parent ) );
</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">@@ -182,10 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 16847
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_revision_diff_caps_post() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
- $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
-
- $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => $editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,12 +198,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $revisions );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->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"> // Author should be able to diff the revisions fine
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->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">@@ -213,23 +218,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'revisions' ),
</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">- $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
- $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
-
- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => $editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $revisions );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $editor_user_id, 'read_post', $post_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->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"> // Author should be able to view the revisions fine
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->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">@@ -244,27 +246,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'revisions' ),
</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">- $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
- $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // The minimum extra caps needed for this test normally you would give the role all the relevant caps.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor_user = new WP_User( $editor_user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editor_user = new WP_User( self::$editor_user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor_user->add_cap( 'edit_published_events' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //create a post as Editor
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => $editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $revisions );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $editor_user_id, 'edit_post', $revision->post_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'edit_post', $revision->post_parent ) );
</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"> // Author shouldn't be able to restore the revisions
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $author_user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$author_user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( user_can( $author_user_id, 'edit_post', $revision->post_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( user_can( self::$author_user_id, 'edit_post', $revision->post_parent ) );
</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">@@ -285,7 +284,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"> $old_id = get_current_user_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->factory->user->create( array( 'role' => 'editor' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_current_user( self::$editor_user_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_status' => 'draft' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,10 +318,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'revisions' ),
</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">- $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
- $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
-
- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => $editor_user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,12 +326,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $revisions );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->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"> // Author should be able to diff the revisions fine
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->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">@@ -373,8 +369,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26042
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_post_revisions_should_order_by_ID_when_post_date_matches() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $post = $this->factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = (array) $post;
</span></span></pre>
</div>
</div>
</body>
</html>