Changeset 41839 for trunk/tests/phpunit/tests/customize/manager.php

Timestamp:

10/12/2017 04:00:15 AM (6 years ago)

Author:

westonruter

Message:

Customize: Add changeset locking in Customizer to prevent users from overriding each other's changes.

• Customization locking is checked when changesets are saved and when heartbeat ticks.
• Lock is lifted immediately upon a user closing the Customizer.
• Heartbeat is introduced into Customizer.
• Changes made to user after it was locked by another user are stored as an autosave revision for restoration.
• Lock notification displays link to preview the other user's changes on the frontend.
• A user loading a locked Customizer changeset will be presented with an option to take over.
• Autosave revisions attached to a published changeset are converted into auto-drafts so that they will be presented to users for restoration.
• Focus constraining is improved in overlay notifications.
• Escape key is stopped from propagating in overlay notifications, and it dismisses dismissible overlay notifications.
• Introduces changesetLocked state which is used to disable the Save button and suppress the AYS dialog when leaving the Customizer.
• Fixes bug where users could be presented with each other's autosave revisions.

Props sayedwp, westonruter, melchoyce.
See #31436, #31897, #39896.
Fixes #42024.

File:

• trunk/tests/phpunit/tests/customize/manager.php (modified) (4 diffs)

trunk/tests/phpunit/tests/customize/manager.php

@@ -1456 +1456 @@
             'autosave' => true,
         ) );
-        $this->assertFalse( wp_get_post_autosave( $changeset_post_id ) );
+        $this->assertFalse( wp_get_post_autosave( $changeset_post_id, get_current_user_id() ) );
         $this->assertContains( 'Autosaved Auto-draft Title', get_post( $changeset_post_id )->post_content );
 
@@ -1494 +1494 @@
 
         // Try autosave.
-        $this->assertFalse( wp_get_post_autosave( $changeset_post_id ) );
+        $this->assertFalse( wp_get_post_autosave( $changeset_post_id, get_current_user_id() ) );
         $r = $wp_customize->save_changeset_post( array(
             'data' => array(
@@ -1506 +1506 @@
 
         // Verify that autosave happened.
-        $autosave_revision = wp_get_post_autosave( $changeset_post_id );
+        $autosave_revision = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
         $this->assertInstanceOf( 'WP_Post', $autosave_revision );
         $this->assertContains( 'Draft Title', get_post( $changeset_post_id )->post_content );
@@ -2636 +2636 @@
                 'publishDate',
                 'statusChoices',
+                'lockUser',
             ),
             array_keys( $data['changeset'] )