<!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][1214] trunk/tests/post/revisions.php: Revisions: Add a new test for a force save filter in wp_save_post_revision</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, #logmsg > ol { margin-left: 0; 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/1214/tests">1214</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2013-02-14 16:43:55 +0000 (Thu, 14 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions: Add a new test for a force save filter in wp_save_post_revision
Also Update the tests to have correct ordering, be less complex and use things like assertCount.
See <a href="http://core.trac.wordpress.org/ticket/7392">#7392</a> and <a href="http://core.trac.wordpress.org/ticket/9843">#9843</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 (1213 => 1214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/post/revisions.php 2013-02-14 15:27:37 UTC (rev 1213)
+++ trunk/tests/post/revisions.php 2013-02-14 16:43:55 UTC (rev 1214)
</span><span class="lines">@@ -37,17 +37,19 @@
</span><span class="cx"> //restore back as Admin
</span><span class="cx"> wp_set_current_user( $admin_user_id );
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><del>- $this->assertEquals( count( $revisions ), 1 );
</del><ins>+ $this->assertCount( 1, $revisions );
</ins><span class="cx">
</span><span class="cx"> $lastrevision = end( $revisions );
</span><del>- $this->assertEquals( $lastrevision->post_content, 'I cant spel werds.' );
</del><ins>+ $this->assertEquals( 'I cant spel werds.', $lastrevision->post_content );
</ins><span class="cx"> // #16215
</span><del>- $this->assertEquals( $lastrevision->post_author, $author_user_id );
</del><ins>+ $this->assertEquals( $author_user_id , $lastrevision->post_author);
</ins><span class="cx">
</span><span class="cx"> wp_restore_post_revision( $lastrevision->ID );
</span><span class="cx">
</span><span class="cx"> //is post_meta correctly set to revision author
</span><del>- $this->assertEquals( get_post_meta( $post_id, '_edit_last', true ), $author_user_id ); //after restoring user
</del><ins>+ $this->assertEquals( $author_user_id, get_post_meta( $post_id, '_edit_last', true ) ); //after restoring user
+
+ wp_set_current_user( 0 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -58,26 +60,57 @@
</span><span class="cx"> $post_id = $this->factory->post->create( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
</span><span class="cx">
</span><span class="cx"> wp_update_post( array( 'post_content' => 'some updated content', 'ID' => $post_id ) ); //1st revision
</span><del>- $this->assertEquals( 1, count( wp_get_post_revisions( $post_id ) ) ); //should be 1 revision so far
</del><ins>+ $this->assertCount( 1, wp_get_post_revisions( $post_id ) ); //should be 1 revision so far
</ins><span class="cx">
</span><span class="cx"> //update the post
</span><span class="cx"> wp_update_post( array( 'post_content' => 'new update for some updated content', 'ID' => $post_id ) ); //2nd revision
</span><del>- $this->assertEquals( 2, count( wp_get_post_revisions( $post_id ) ) ); //should be 2 revision so far
</del><ins>+ $this->assertCount( 2, wp_get_post_revisions( $post_id ) ); //should be 2 revision so far
</ins><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->assertEquals( 2, count( wp_get_post_revisions( $post_id ) ) ); //should still be 2 revision
</del><ins>+ $this->assertCount( 2, wp_get_post_revisions( $post_id ) ); //should still be 2 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->assertEquals( 3, count( wp_get_post_revisions( $post_id ) ) ); //should be 3 revision
</del><ins>+ $this->assertCount( 3, wp_get_post_revisions( $post_id ) ); //should be 3 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->assertEquals( 3, count( wp_get_post_revisions( $post_id ) ) ); //should still be 3 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">
</span><span class="cx"> /**
</span><ins>+ * @ticket 7392
+ * @ticket 9843
+ */
+ function test_revision_force_save_revision_even_if_unchanged() {
+ add_filter( 'wp_save_post_revision_check_for_changes', '__return_false' );
+
+ $post_id = $this->factory->post->create( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
+
+ wp_update_post( array( 'post_content' => 'some updated content', 'ID' => $post_id ) ); //1st revision
+ $this->assertCount( 1, wp_get_post_revisions( $post_id ) );
+
+ //update the post
+ wp_update_post( array( 'post_content' => 'new update for some updated content', 'ID' => $post_id ) ); //2nd revision
+ $this->assertCount( 2, wp_get_post_revisions( $post_id ) );
+
+ //next try to save another identical update, tests for patch that prevents storing duplicates
+ wp_update_post( array( 'post_content' => 'new update for some updated content', 'ID' => $post_id ) ); //content unchanged, shouldn't save
+ $this->assertCount( 3, wp_get_post_revisions( $post_id ) );
+
+ //next try to save another update, same content, but new ttile, should save revision
+ wp_update_post( array( 'post_title' => 'some-post-changed', 'post_content' => 'new update for some updated content', 'ID' => $post_id ) );
+ $this->assertCount( 4, wp_get_post_revisions( $post_id ) );
+
+ //next try to save another identical update
+ 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
+ $this->assertCount( 5, wp_get_post_revisions( $post_id ) );
+
+ remove_filter( 'wp_save_post_revision_check_for_changes', '__return_false' );
+ }
+
+ /**
</ins><span class="cx"> * Tests the Caps used in the action=view case of wp-admin/revision.php
</span><span class="cx"> * @ticket 16847
</span><span class="cx"> */
</span><span class="lines">@@ -85,23 +118,20 @@
</span><span class="cx"> $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</span><span class="cx"> $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</span><span class="cx">
</span><del>- //create a post as Editor
- wp_set_current_user( $editor_user_id );
- $post_id = $this->factory->post->create( array( 'post_type' => 'post' ) );
</del><ins>+ $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => $editor_user_id ) );
</ins><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->assertEquals( count( $revisions ), 1 );
- $this->assertTrue( current_user_can( 'read_post', $post_id ) );
</del><ins>+ $this->assertCount( 1, $revisions );
+ $this->assertTrue( user_can( $editor_user_id, 'read_post', $post_id ) );
</ins><span class="cx">
</span><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'read_post', $revision->ID ) );
</del><ins>+ $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Author should be able to view the revisions fine
</span><del>- wp_set_current_user( $author_user_id );
</del><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'read_post', $revision->ID ) );
</del><ins>+ $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -113,21 +143,18 @@
</span><span class="cx"> $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</span><span class="cx"> $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</span><span class="cx">
</span><del>- //create a post as Editor
- wp_set_current_user( $editor_user_id );
- $post_id = $this->factory->post->create( array( 'post_type' => 'post' ) );
</del><ins>+ $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => $editor_user_id ) );
</ins><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->assertEquals( count( $revisions ), 1 );
</del><ins>+ $this->assertCount( 1, $revisions );
</ins><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'edit_post', $revision->post_parent ) );
</del><ins>+ $this->assertTrue( user_can( $editor_user_id, 'edit_post', $revision->post_parent ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Author shouldn't be able to restore the revisions
</span><del>- wp_set_current_user( $author_user_id );
</del><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertFalse( current_user_can( 'edit_post', $revision->post_parent ) );
</del><ins>+ $this->assertFalse( user_can( $author_user_id, 'edit_post', $revision->post_parent ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -139,23 +166,20 @@
</span><span class="cx"> $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</span><span class="cx"> $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</span><span class="cx">
</span><del>- //create a post as Editor
- wp_set_current_user( $editor_user_id );
- $post_id = $this->factory->post->create( array( 'post_type' => 'post' ) );
</del><ins>+ $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_author' => $editor_user_id ) );
</ins><span class="cx"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx"> wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
</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 ), 2 );
</del><ins>+ $this->assertCount( 2, $revisions );
</ins><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'read_post', $revision->ID ) );
</del><ins>+ $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Author should be able to diff the revisions fine
</span><del>- wp_set_current_user( $author_user_id );
</del><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'read_post', $revision->ID ) );
</del><ins>+ $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -173,23 +197,20 @@
</span><span class="cx"> $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</span><span class="cx"> $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</span><span class="cx">
</span><del>- //create a post as Editor
- wp_set_current_user( $editor_user_id );
- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type ) );
</del><ins>+ $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => $editor_user_id ) );
</ins><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->assertEquals( count( $revisions ), 1 );
- $this->assertTrue( current_user_can( 'read_post', $post_id ) );
</del><ins>+ $this->assertCount( 1, $revisions );
+ $this->assertTrue( user_can( $editor_user_id, 'read_post', $post_id ) );
</ins><span class="cx">
</span><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'read_post', $revision->ID ) );
</del><ins>+ $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Author should be able to view the revisions fine
</span><del>- wp_set_current_user( $author_user_id );
</del><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'read_post', $revision->ID ) );
</del><ins>+ $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -208,31 +229,23 @@
</span><span class="cx"> $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</span><span class="cx">
</span><span class="cx"> // The minimum extra caps needed for this test normally you would give the role all the relevant caps.
</span><del>- $cpt_cap_map = array(
- 'edit_published_posts' => 'edit_published_events',
- );
-
</del><span class="cx"> $editor_user = new WP_User( $editor_user_id );
</span><del>- foreach( $cpt_cap_map as $post_cap => $cpt_cap ) {
- if ( $editor_user->has_cap( $post_cap ) )
- $editor_user->add_cap( $cpt_cap );
- }
</del><ins>+ $editor_user->add_cap( 'edit_published_events' );
</ins><span class="cx">
</span><span class="cx"> //create a post as Editor
</span><del>- wp_set_current_user( $editor_user_id );
- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type ) );
</del><ins>+ $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => $editor_user_id ) );
</ins><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->assertEquals( count( $revisions ), 1 );
</del><ins>+ $this->assertCount( 1, $revisions );
</ins><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'edit_post', $revision->post_parent ) );
</del><ins>+ $this->assertTrue( user_can( $editor_user_id, 'edit_post', $revision->post_parent ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Author shouldn't be able to restore the revisions
</span><span class="cx"> wp_set_current_user( $author_user_id );
</span><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertFalse( current_user_can( 'edit_post', $revision->post_parent ) );
</del><ins>+ $this->assertFalse( user_can( $author_user_id, 'edit_post', $revision->post_parent ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -290,9 +303,7 @@
</span><span class="cx"> $author_user_id = $this->factory->user->create( array( 'role' => 'author' ) );
</span><span class="cx"> $editor_user_id = $this->factory->user->create( array( 'role' => 'editor' ) );
</span><span class="cx">
</span><del>- //create a post as Editor
- wp_set_current_user( $editor_user_id );
- $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type ) );
</del><ins>+ $post_id = $this->factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => $editor_user_id ) );
</ins><span class="cx"> wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
</span><span class="cx"> wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
</span><span class="cx">
</span><span class="lines">@@ -300,13 +311,12 @@
</span><span class="cx"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="cx"> $this->assertEquals( count( $revisions ), 2 );
</span><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'read_post', $revision->ID ) );
</del><ins>+ $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Author should be able to diff the revisions fine
</span><del>- wp_set_current_user( $author_user_id );
</del><span class="cx"> foreach ( $revisions as $revision ) {
</span><del>- $this->assertTrue( current_user_can( 'read_post', $revision->ID ) );
</del><ins>+ $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>