Changeset 1309 in tests

Timestamp:

07/10/13 22:42:57 (12 months ago)

Author:

nacin

Message:

Rewrite revisions unit tests to account for [23842].

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 #24708.

File:

• trunk/tests/post/revisions.php (modified) (11 diffs)

trunk/tests/post/revisions.php

@@ -29 +29 @@
         //create a post as Author
         wp_set_current_user( $author_user_id );
-        $post_id = $this->factory->post->create( array( 'post_type' => 'post', 'post_content' => 'I cant spel werds.' ) );
+        $post = get_default_post_to_edit( 'post', true );
+        $post_id = $post->ID;
+
+        wp_update_post( array( 'post_status' => 'draft', 'post_content' => 'I cant spel werds.', 'ID' => $post_id ) );
 
         //update post as Editor
@@ -37 +40 @@
         //restore back as Admin
         wp_set_current_user( $admin_user_id );
-        $revisions = wp_get_post_revisions( $post_id );
+        $revisions = wp_get_post_revisions( $post->ID );
         $this->assertCount( 2, $revisions );
 
@@ -58 +61 @@
     */
     function test_revision_dont_save_revision_if_unchanged() {
-        $post_id = $this->factory->post->create( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
+        $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 ) );
+
         $this->assertCount( 1, wp_get_post_revisions( $post_id ) ); // Just the initial revision
 
@@ -72 +81 @@
         //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 ) ); //should still be 2 revision
+        $this->assertCount( 3, wp_get_post_revisions( $post_id ) ); //should still be 3 revision
 
         //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 ) ); //should  be 3 revision
+        $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); //should  be 4 revision
 
         //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( 4, wp_get_post_revisions( $post_id ) ); //should still be 3 revision
+        $this->assertCount( 4, wp_get_post_revisions( $post_id ) ); //should still be 4 revision
     }
 
@@ -90 +99 @@
         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' ) );
+        $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 ) );
+
         $this->assertCount( 1, wp_get_post_revisions( $post_id ) );
 
@@ -127 +142 @@
 
         $revisions = wp_get_post_revisions( $post_id );
+        $this->assertCount( 1, $revisions );
+        $this->assertTrue( user_can( $editor_user_id, 'read_post', $post_id ) );
+
+        foreach ( $revisions as $revision ) {
+            $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
+        }
+
+        // Author should be able to view the revisions fine
+        foreach ( $revisions as $revision ) {
+            $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
+        }
+    }
+
+    /**
+     * Tests the Caps used in the action=restore case of wp-admin/revision.php
+     * @ticket 16847
+     */
+    function test_revision_restore_caps_post() {
+        $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 ) );
+        wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
+
+        $revisions = wp_get_post_revisions( $post_id );
+        $this->assertCount( 1, $revisions );
+        foreach ( $revisions as $revision ) {
+             $this->assertTrue( user_can( $editor_user_id, 'edit_post', $revision->post_parent ) );
+        }
+
+        // Author shouldn't be able to restore the revisions
+        foreach ( $revisions as $revision ) {
+             $this->assertFalse( user_can( $author_user_id, 'edit_post', $revision->post_parent ) );
+        }
+    }
+
+    /**
+     * Tests the Caps used in the action=diff case of wp-admin/revision.php
+     * @ticket 16847
+     */
+    function test_revision_diff_caps_post() {
+        $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 ) );
+        wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
+        wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
+
+        // Diff checks if you can read both left and right revisions
+        $revisions = wp_get_post_revisions( $post_id );
         $this->assertCount( 2, $revisions );
-        $this->assertTrue( user_can( $editor_user_id, 'read_post', $post_id ) );
-
-        foreach ( $revisions as $revision ) {
-            $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
-        }
-
-        // Author should be able to view the revisions fine
-        foreach ( $revisions as $revision ) {
-            $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
-        }
-    }
-
-    /**
-     * Tests the Caps used in the action=restore case of wp-admin/revision.php
-     * @ticket 16847
-     */
-    function test_revision_restore_caps_post() {
-        $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 ) );
-        wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
-
-        $revisions = wp_get_post_revisions( $post_id );
-        $this->assertCount( 2, $revisions );
-        foreach ( $revisions as $revision ) {
-             $this->assertTrue( user_can( $editor_user_id, 'edit_post', $revision->post_parent ) );
-        }
-
-        // Author shouldn't be able to restore the revisions
-        foreach ( $revisions as $revision ) {
-             $this->assertFalse( user_can( $author_user_id, 'edit_post', $revision->post_parent ) );
-        }
-    }
-
-    /**
-     * Tests the Caps used in the action=diff case of wp-admin/revision.php
-     * @ticket 16847
-     */
-    function test_revision_diff_caps_post() {
-        $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 ) );
-        wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
-        wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
-
-        // Diff checks if you can read both left and right revisions
-        $revisions = wp_get_post_revisions( $post_id );
-        $this->assertCount( 3, $revisions );
         foreach ( $revisions as $revision ) {
             $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );
@@ -206 +221 @@
 
         $revisions = wp_get_post_revisions( $post_id );
-        $this->assertCount( 2, $revisions );
+        $this->assertCount( 1, $revisions );
         $this->assertTrue( user_can( $editor_user_id, 'read_post', $post_id ) );
 
@@ -242 +257 @@
 
         $revisions = wp_get_post_revisions( $post_id );
-        $this->assertCount( 2, $revisions );
+        $this->assertCount( 1, $revisions );
         foreach ( $revisions as $revision ) {
             $this->assertTrue( user_can( $editor_user_id, 'edit_post', $revision->post_parent ) );
@@ -277 +292 @@
 
         $revisions = wp_get_post_revisions( $post_id );
-        $this->assertCount( 2, $revisions );
+        $this->assertCount( 1, $revisions );
         foreach ( $revisions as $revision ) {
             $this->assertTrue( current_user_can( 'edit_post', $revision->post_parent ) );
@@ -286 +301 @@
 
         $revisions = wp_get_post_revisions( $post_id );
-        $this->assertCount( 3, $revisions );
+        $this->assertCount( 2, $revisions );
         foreach ( $revisions as $revision ) {
             $this->assertFalse( current_user_can( 'edit_post', $revision->post_parent ) );
@@ -314 +329 @@
         // Diff checks if you can read both left and right revisions
         $revisions = wp_get_post_revisions( $post_id );
-        $this->assertEquals( count( $revisions ), 3 );
+        $this->assertCount( 2, $revisions );
         foreach ( $revisions as $revision ) {
             $this->assertTrue( user_can( $editor_user_id, 'read_post', $revision->ID ) );