Fix collaboration E2E tests failing due to inline script timing

wp_collaboration_inject_setting was hooked to admin_init, but
wp-core-data is not registered at that point, causing
wp_add_inline_script to silently fail. Move the hook to
enqueue_block_editor_assets where the handle is guaranteed to exist.

Also replace the fragile form-scraping setCollaboration helper with
requestUtils.updateSiteSettings and tolerate pre-existing test users
so interrupted runs do not break subsequent test executions.

Author: josephfusco

src/wp-includes/default-filters.php

@@ -796,7 +796,7 @@
 add_action( 'init', '_wp_register_default_font_collections' );
 
 // Collaboration.
-add_action( 'admin_init', 'wp_collaboration_inject_setting' );
+add_action( 'enqueue_block_editor_assets', 'wp_collaboration_inject_setting' );
 
 // Add ignoredHookedBlocks metadata attribute to the template and template part post types.
 add_filter( 'rest_pre_insert_wp_template', 'inject_ignored_hooked_blocks_metadata_attributes' );

tests/e2e/specs/collaboration/fixtures/collaboration-utils.js

@@ -85,36 +85,11 @@ export default class CollaborationUtils {
 	/**
 	 * Set the real-time collaboration WordPress setting.
 	 *
-	 * Uses the form-based approach because this setting is registered
-	 * on admin_init in the "writing" group and is not exposed via
-	 * /wp/v2/settings.
-	 *
 	 * @param {boolean} enabled Whether to enable or disable collaboration.
 	 */
 	async setCollaboration( enabled ) {
-		const response = await this.requestUtils.request.get(
-			'/wp-admin/options-writing.php'
-		);
-		const html = await response.text();
-		const nonce = html.match( /name="_wpnonce" value="([^"]+)"/ )[ 1 ];
-
-		const formData = {
-			option_page: 'writing',
-			action: 'update',
-			_wpnonce: nonce,
-			_wp_http_referer: '/wp-admin/options-writing.php',
-			submit: 'Save Changes',
-			default_category: 1,
-			default_post_format: 0,
-		};
-
-		if ( enabled ) {
-			formData.wp_enable_real_time_collaboration = 1;
-		}
-
-		await this.requestUtils.request.post( '/wp-admin/options.php', {
-			form: formData,
-			failOnStatusCode: true,
+		await this.requestUtils.updateSiteSettings( {
+			wp_enable_real_time_collaboration: enabled,
 		} );
 	}
 

tests/e2e/specs/collaboration/fixtures/index.js

@@ -32,8 +32,16 @@ export const test = base.extend( {
 			page,
 		} );
 		await utils.setCollaboration( true );
-		await requestUtils.createUser( SECOND_USER );
-		await requestUtils.createUser( THIRD_USER );
+		await requestUtils.createUser( SECOND_USER ).catch( ( error ) => {
+			if ( error?.code !== 'existing_user_login' ) {
+				throw error;
+			}
+		} );
+		await requestUtils.createUser( THIRD_USER ).catch( ( error ) => {
+			if ( error?.code !== 'existing_user_login' ) {
+				throw error;
+			}
+		} );
 		await use( utils );
 		await utils.teardown();
 	},