Changeset 61697

Timestamp:

02/19/2026 03:25:10 PM (7 weeks ago)

Author:

ellatrix

Message:

Real-time collaboration: fix unit tests.

Fixes autosave controller tests, which began failing when RTC was enabled. The tests now need to cover two different code paths:

​https://github.com/WordPress/wordpress-develop/blob/15ffb4392eddb43fdd9f31e075ebc85e857664c1/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php#L259

Props czarate.
See #64622.

Location:

trunk/tests

Files:

• phpunit/tests/rest-api/rest-autosaves-controller.php (modified) (5 diffs)
• qunit/fixtures/wp-api-generated.js (modified) (2 diffs)

trunk/tests/phpunit/tests/rest-api/rest-autosaves-controller.php

@@ -571 +571 @@
 
     public function test_rest_autosave_draft_post_same_author() {
+        $original_option = get_option( 'enable_real_time_collaboration' );
+        update_option( 'enable_real_time_collaboration', false );
+
         wp_set_current_user( self::$editor_id );
 
@@ -605 +608 @@
 
         wp_delete_post( $post_id );
+        update_option( 'enable_real_time_collaboration', $original_option );
     }
 
@@ -745 +749 @@
 
     public function test_update_item_draft_page_with_parent() {
+        $original_option = get_option( 'enable_real_time_collaboration' );
+        update_option( 'enable_real_time_collaboration', false );
+
         wp_set_current_user( self::$editor_id );
         $request = new WP_REST_Request( 'POST', '/wp/v2/pages/' . self::$child_draft_page_id . '/autosaves' );
@@ -762 +769 @@
         $this->assertSame( self::$child_draft_page_id, $data['id'] );
         $this->assertSame( self::$parent_page_id, $data['parent'] );
+        update_option( 'enable_real_time_collaboration', $original_option );
     }
 
@@ -921 +929 @@
         );
     }
+
+    /**
+     * When real-time collaboration is enabled, autosaving a draft post by the
+     * same author should create a revision instead of updating the post directly.
+     */
+    public function test_rest_autosave_draft_post_same_author_with_rtc() {
+        $original_option = get_option( 'enable_real_time_collaboration' );
+        update_option( 'enable_real_time_collaboration', true );
+
+        wp_set_current_user( self::$editor_id );
+
+        $post_data = array(
+            'post_content' => 'Test post content',
+            'post_title'   => 'Test post title',
+            'post_excerpt' => 'Test post excerpt',
+        );
+        $post_id   = wp_insert_post( $post_data );
+
+        $autosave_data = array(
+            'id'      => $post_id,
+            'content' => 'Updated post \ content',
+            'title'   => 'Updated post title',
+        );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
+        $request->add_header( 'Content-Type', 'application/json' );
+        $request->set_body( wp_json_encode( $autosave_data ) );
+
+        $response = rest_get_server()->dispatch( $request );
+        $new_data = $response->get_data();
+        $post     = get_post( $post_id );
+
+        // With RTC enabled, a revision is created instead of updating the post.
+        $this->assertNotSame( $post_id, $new_data['id'] );
+        $this->assertSame( $post_id, $new_data['parent'] );
+
+        // The autosave revision should have the updated content.
+        $this->assertSame( $autosave_data['content'], $new_data['content']['raw'] );
+        $this->assertSame( $autosave_data['title'], $new_data['title']['raw'] );
+
+        // The draft post should not be updated.
+        $this->assertSame( $post_data['post_content'], $post->post_content );
+        $this->assertSame( $post_data['post_title'], $post->post_title );
+        $this->assertSame( $post_data['post_excerpt'], $post->post_excerpt );
+
+        wp_delete_post( $post_id );
+        update_option( 'enable_real_time_collaboration', $original_option );
+    }
+
+    /**
+     * When real-time collaboration is enabled, autosaving a draft page with
+     * a parent should create a revision instead of updating the page directly.
+     */
+    public function test_update_item_draft_page_with_parent_with_rtc() {
+        $original_option = get_option( 'enable_real_time_collaboration' );
+        update_option( 'enable_real_time_collaboration', true );
+
+        wp_set_current_user( self::$editor_id );
+        $request = new WP_REST_Request( 'POST', '/wp/v2/pages/' . self::$child_draft_page_id . '/autosaves' );
+        $request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
+
+        $params = $this->set_post_data(
+            array(
+                'id'     => self::$child_draft_page_id,
+                'author' => self::$editor_id,
+            )
+        );
+
+        $request->set_body_params( $params );
+        $response = rest_get_server()->dispatch( $request );
+        $data     = $response->get_data();
+
+        // With RTC enabled, a revision is created instead of updating the page.
+        $this->assertNotSame( self::$child_draft_page_id, $data['id'] );
+        $this->assertSame( self::$child_draft_page_id, $data['parent'] );
+        update_option( 'enable_real_time_collaboration', $original_option );
+    }
 }

trunk/tests/qunit/fixtures/wp-api-generated.js

@@ -21 +21 @@
         "wp-site-health/v1",
         "wp-block-editor/v1",
-        "wp-abilities/v1"
+        "wp-abilities/v1",
+        "wp-sync/v1"
     ],
     "authentication": {
@@ -12699 +12700 @@
                 }
             ]
+        },
+        "/wp-sync/v1": {
+            "namespace": "wp-sync/v1",
+            "methods": [
+                "GET"
+            ],
+            "endpoints": [
+                {
+                    "methods": [
+                        "GET"
+                    ],
+                    "args": {
+                        "namespace": {
+                            "default": "wp-sync/v1",
+                            "required": false
+                        },
+                        "context": {
+                            "default": "view",
+                            "required": false
+                        }
+                    }
+                }
+            ],
+            "_links": {
+                "self": [
+                    {
+                        "href": "http://example.org/index.php?rest_route=/wp-sync/v1"
+                    }
+                ]
+            }
+        },
+        "/wp-sync/v1/updates": {
+            "namespace": "wp-sync/v1",
+            "methods": [
+                "POST"
+            ],
+            "endpoints": [
+                {
+                    "methods": [
+                        "POST"
+                    ],
+                    "args": {
+                        "rooms": {
+                            "items": {
+                                "properties": {
+                                    "after": {
+                                        "minimum": 0,
+                                        "required": true,
+                                        "type": "integer"
+                                    },
+                                    "awareness": {
+                                        "required": true,
+                                        "type": "object"
+                                    },
+                                    "client_id": {
+                                        "minimum": 1,
+                                        "required": true,
+                                        "type": "integer"
+                                    },
+                                    "room": {
+                                        "required": true,
+                                        "type": "string",
+                                        "pattern": "^[^/]+/[^/:]+(?::\\S+)?$"
+                                    },
+                                    "updates": {
+                                        "items": {
+                                            "properties": {
+                                                "data": {
+                                                    "type": "string",
+                                                    "required": true
+                                                },
+                                                "type": {
+                                                    "type": "string",
+                                                    "required": true,
+                                                    "enum": [
+                                                        "compaction",
+                                                        "sync_step1",
+                                                        "sync_step2",
+                                                        "update"
+                                                    ]
+                                                }
+                                            },
+                                            "required": true,
+                                            "type": "object"
+                                        },
+                                        "minItems": 0,
+                                        "required": true,
+                                        "type": "array"
+                                    }
+                                },
+                                "type": "object"
+                            },
+                            "type": "array",
+                            "required": true
+                        }
+                    }
+                }
+            ],
+            "_links": {
+                "self": [
+                    {
+                        "href": "http://example.org/index.php?rest_route=/wp-sync/v1/updates"
+                    }
+                ]
+            }
         }
     },