<!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>[Tests][1309] trunk/tests/post/revisions.php: Rewrite revisions unit tests to account for [23842].</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/1309/tests">1309</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-07-10 22:42:57 +0000 (Wed, 10 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rewrite revisions unit tests to account for <a href="http://core.trac.wordpress.org/changeset/23842/tests">[23842]</a>.
wp_insert_post() (and thus the factory) does *not* create a revision by default. When it is desired for the first "save" to be a revision, an auto-draft should be used.
The various cap-checking tests still use wp_insert_post() to test that route as well, hence the decrementing of revision counts.
see <a href="http://core.trac.wordpress.org/ticket/24708">#24708</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestspostrevisionsphp">trunk/tests/post/revisions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestspostrevisionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/post/revisions.php (1308 => 1309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/post/revisions.php 2013-07-10 03:33:29 UTC (rev 1308)
+++ trunk/tests/post/revisions.php 2013-07-10 22:42:57 UTC (rev 1309)
</span><span class="lines">@@ -28,15 +28,18 @@
</span><span class="cx">
</span><span class="cx"> //create a post as Author
</span><span class="cx"> wp_set_current_user( $author_user_id );
</span><del>- $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_content' => 'I cant spel werds.' ) );
</del><ins>+ $post = get_default_post_to_edit( 'post', true );
+ $post_id = $post->ID;
</ins><span class="cx">
</span><ins>+ wp_update_post( array( 'post_status' => 'draft', 'post_content' => 'I cant spel werds.', 'ID' => $post_id ) );
+
</ins><span class="cx"> //update post as Editor
</span><span class="cx"> wp_set_current_user( $editor_user_id );
</span><span class="cx"> wp_update_post( array( 'post_content' => 'The Editor was in fixing your typos.', 'ID' => $post_id ) );
</span><span class="cx">
</span><span class="cx"> //restore back as Admin
</span><span class="cx"> wp_set_current_user( $admin_user_id );
</span><del>- $revisions = wp_get_post_revisions( $post_id );
</del><ins>+ $revisions = wp_get_post_revisions( $post->ID );
</ins><span class="cx"> $this->assertCount( 2, $revisions );
</span><span class="cx">
</span><span class="cx"> $lastrevision = end( $revisions );
</span><span class="lines">@@ -57,7 +60,13 @@
</span><span class="cx"> * @ticket 9843
</span><span class="cx"> */
</span><span class="cx"> function test_revision_dont_save_revision_if_unchanged() {
</span><del>- $post_id = $this->factory->post->create( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
</del><ins>+ $post = get_default_post_to_edit( 'post', true );
+ $post_id = $post->ID;
+
+ $this->assertCount( 0, wp_get_post_revisions( $post_id ) ); // No revisions on auto-draft creation.
+
+ wp_update_post( array( 'post_status' => 'draft', 'post_title' => 'some-post', 'post_content' => 'some_content', 'ID' => $post_id ) );
+
</ins><span class="cx"> $this->assertCount( 1, wp_get_post_revisions( $post_id ) ); // Just the initial revision
</span><span class="cx">
</span><span class="cx"> // First update
</span><span class="lines">@@ -71,15 +80,15 @@
</span><span class="cx">
</span><span class="cx"> //next try to save another identical update, tests for patch that prevents storing duplicates
</span><span class="cx"> wp_update_post( array( 'post_content' => 'new update for some updated content', 'ID' => $post_id ) ); //content unchanged, shouldn't save
</span><del>- $this->assertCount( 3, wp_get_post_revisions( $post_id ) ); //should still be 2 revision
</del><ins>+ $this->assertCount( 3, wp_get_post_revisions( $post_id ) ); //should still be 3 revision
</ins><span class="cx">
</span><span class="cx"> //next try to save another update, same content, but new ttile, should save revision
</span><span class="cx"> wp_update_post( array( 'post_title' => 'some-post-changed', 'post_content' => 'new update for some updated content', 'ID' => $post_id ) );
</span><del>- $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); //should be 3 revision
</del><ins>+ $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); //should be 4 revision
</ins><span class="cx">
</span><span class="cx"> //next try to save another identical update
</span><span class="cx"> wp_update_post( array( 'post_title' => 'some-post-changed', 'post_content' => 'new update for some updated content', 'ID' => $post_id ) ); //content unchanged, shouldn't save
</span><del>- $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); //should still be 3 revision
</del><ins>+ $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); //should still be 4 revision
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -89,7 +98,13 @@
</span><span class="cx"> function test_revision_force_save_revision_even_if_unchanged() {
</span><span class="cx"> add_filter( 'wp_save_post_revision_check_for_changes', '__return_false' );
</span><span class="cx">
</span><del>- $post_id = $this->factory->post->create( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
</del><ins>+ $post = get_default_post_to_edit( 'post', true );
+ $post_id = $post->ID;
+
+ $this->assertCount( 0, wp_get_post_revisions( $post_id ) ); // No revisions on auto-draft creation.
+
+ wp_update_post( array( 'post_status' => 'draft', 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content', 'ID' => $post_id ) );
+
</ins><span class="cx"> $this->assertCount( 1, wp_get_post_revisions( $post_id ) );
</span><span class="cx">
</span><span class="cx"> wp_update_post( array( 'post_content' => 'some updated content', 'ID' => $post_id ) ); //1st revision
</span><span class="lines">@@ -126,7 +141,7 @@
</span><span class="cx"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx">
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><del>- $this->assertCount( 2, $revisions );
</del><ins>+ $this->assertCount( 1, $revisions );
</ins><span class="cx"> $this->assertTrue( user_can( $editor_user_id, 'read_post', $post_id ) );
</span><span class="cx">
</span><span class="cx"> foreach ( $revisions as $revision ) {
</span><span class="lines">@@ -151,7 +166,7 @@
</span><span class="cx"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx">
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><del>- $this->assertCount( 2, $revisions );
</del><ins>+ $this->assertCount( 1, $revisions );
</ins><span class="cx"> foreach ( $revisions as $revision ) {
</span><span class="cx"> $this->assertTrue( user_can( $editor_user_id, 'edit_post', $revision->post_parent ) );
</span><span class="cx"> }
</span><span class="lines">@@ -176,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> // Diff checks if you can read both left and right revisions
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><del>- $this->assertCount( 3, $revisions );
</del><ins>+ $this->assertCount( 2, $revisions );
</ins><span class="cx"> foreach ( $revisions as $revision ) {
</span><span class="cx"> $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</span><span class="cx"> }
</span><span class="lines">@@ -205,7 +220,7 @@
</span><span class="cx"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx">
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><del>- $this->assertCount( 2, $revisions );
</del><ins>+ $this->assertCount( 1, $revisions );
</ins><span class="cx"> $this->assertTrue( user_can( $editor_user_id, 'read_post', $post_id ) );
</span><span class="cx">
</span><span class="cx"> foreach ( $revisions as $revision ) {
</span><span class="lines">@@ -241,7 +256,7 @@
</span><span class="cx"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx">
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><del>- $this->assertCount( 2, $revisions );
</del><ins>+ $this->assertCount( 1, $revisions );
</ins><span class="cx"> foreach ( $revisions as $revision ) {
</span><span class="cx"> $this->assertTrue( user_can( $editor_user_id, 'edit_post', $revision->post_parent ) );
</span><span class="cx"> }
</span><span class="lines">@@ -276,7 +291,7 @@
</span><span class="cx"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx">
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><del>- $this->assertCount( 2, $revisions );
</del><ins>+ $this->assertCount( 1, $revisions );
</ins><span class="cx"> foreach ( $revisions as $revision ) {
</span><span class="cx"> $this->assertTrue( current_user_can( 'edit_post', $revision->post_parent ) );
</span><span class="cx"> $this->assertTrue( current_user_can( 'edit_post', $revision->ID ) );
</span><span class="lines">@@ -285,7 +300,7 @@
</span><span class="cx"> wp_update_post( array( 'post_status' => 'publish', 'ID' => $post_id, 'post_content' => rand_str() ) );
</span><span class="cx">
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><del>- $this->assertCount( 3, $revisions );
</del><ins>+ $this->assertCount( 2, $revisions );
</ins><span class="cx"> foreach ( $revisions as $revision ) {
</span><span class="cx"> $this->assertFalse( current_user_can( 'edit_post', $revision->post_parent ) );
</span><span class="cx"> $this->assertFalse( current_user_can( 'edit_post', $revision->ID ) );
</span><span class="lines">@@ -313,7 +328,7 @@
</span><span class="cx">
</span><span class="cx"> // Diff checks if you can read both left and right revisions
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><del>- $this->assertEquals( count( $revisions ), 3 );
</del><ins>+ $this->assertCount( 2, $revisions );
</ins><span class="cx"> foreach ( $revisions as $revision ) {
</span><span class="cx"> $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>