Use option filter rather than setting option.

Author: peterwilsoncc

tests/phpunit/tests/collaboration/restAutosavesController.php

@@ -21,7 +21,6 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$author_id );
 		self::delete_user( self::$editor_id );
-		delete_option( 'wp_collaboration_enabled' );
 	}
 
 	public function set_up() {
@@ -86,7 +85,7 @@ private function dispatch_autosave( int $post_id, string $title, string $content
 	 * @ticket 65138
 	 */
 	public function test_auto_draft_autosave_promotes_parent_post_when_collaboration_is_disabled() {
-		update_option( 'wp_collaboration_enabled', 0 );
+		add_filter( 'pre_option_wp_collaboration_enabled', '__return_zero' );
 
 		$post_id = $this->create_auto_draft();
 		$title   = 'No RTC autosaved title';
@@ -105,7 +104,7 @@ public function test_auto_draft_autosave_promotes_parent_post_when_collaboration
 	 * @ticket 65138
 	 */
 	public function test_auto_draft_autosave_promotes_parent_post_when_collaboration_is_enabled() {
-		update_option( 'wp_collaboration_enabled', 1 );
+		add_filter( 'pre_option_wp_collaboration_enabled', '__return_true' );
 
 		$post_id = $this->create_auto_draft();
 		$title   = 'RTC autosaved title';
@@ -124,7 +123,7 @@ public function test_auto_draft_autosave_promotes_parent_post_when_collaboration
 	 * @ticket 65138
 	 */
 	public function test_collaborator_auto_draft_autosave_promotes_parent_post_when_collaboration_is_enabled() {
-		update_option( 'wp_collaboration_enabled', 1 );
+		add_filter( 'pre_option_wp_collaboration_enabled', '__return_true' );
 
 		$post_id = $this->create_auto_draft();
 		$title   = 'RTC collaborator autosaved title';
@@ -144,7 +143,7 @@ public function test_collaborator_auto_draft_autosave_promotes_parent_post_when_
 	 * @ticket 65138
 	 */
 	public function test_draft_autosave_creates_revision_when_collaboration_is_enabled() {
-		update_option( 'wp_collaboration_enabled', 1 );
+		add_filter( 'pre_option_wp_collaboration_enabled', '__return_true' );
 
 		$original_title   = 'Original RTC draft title';
 		$original_content = '<!-- wp:paragraph --><p>Original RTC draft content</p><!-- /wp:paragraph -->';

tests/phpunit/tests/collaboration/wpDeleteOldCollaborationData.php

@@ -16,19 +16,17 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		self::$editor_id = $factory->user->create( array( 'role' => 'editor' ) );
 		self::$post_id   = $factory->post->create( array( 'post_author' => self::$editor_id ) );
 
-		update_option( 'wp_collaboration_enabled', 1 );
+		add_filter( 'pre_option_wp_collaboration_enabled', '__return_true' );
 	}
 
 	public static function wpTearDownAfterClass() {
-		self::delete_user( self::$editor_id );
-		delete_option( 'wp_collaboration_enabled' );
-		wp_delete_post( self::$post_id, true );
+		remove_filter( 'pre_option_wp_collaboration_enabled', '__return_true' );
 	}
 
 	public function set_up() {
 		parent::set_up();
 
-		update_option( 'wp_collaboration_enabled', 1 );
+		add_filter( 'pre_option_wp_collaboration_enabled', '__return_true' );
 	}
 
 	/**
@@ -195,7 +193,7 @@ public function test_cron_cleanup_when_collaboration_disabled(): void {
 		$this->assertIsInt( wp_next_scheduled( 'wp_delete_old_collaboration_data' ), 'Cron event should be scheduled before cleanup.' );
 
 		// Disable collaboration.
-		update_option( 'wp_collaboration_enabled', false );
+		add_filter( 'pre_option_wp_collaboration_enabled', '__return_zero' );
 
 		wp_delete_old_collaboration_data();