Fix WP 7.0 notice: replace defer arg with strategy => defer in wp_register_script

includes/assets.php

@@ -258,7 +258,7 @@ public function register_scripts() {
 				$version,
 				array(
 					'in_footer' => true,
-					'defer'     => true,
+					'strategy'  => 'defer',
 				)
 			);
 
@@ -269,7 +269,7 @@ public function register_scripts() {
 				$version,
 				array(
 					'in_footer' => true,
-					'defer'     => true,
+					'strategy'  => 'defer',
 				)
 			);
 
@@ -762,4 +762,4 @@ function acf_enqueue_scripts( $args = array() ) {
  */
 function acf_enqueue_uploader() {
 	return acf_get_instance( 'ACF_Assets' )->enqueue_uploader();
-}
+}

tests/e2e/field-helpers.js

@@ -141,7 +141,10 @@
  */
 async function uploadImageViaModal( page, imagePath ) {
 	// Wait for media modal to open
-	await page.waitForSelector( '.media-modal', { state: 'visible' } );
+	await page.waitForSelector( '.media-modal', {
+		state: 'visible',
+		timeout: 20000,
+	} );
 
 	// Click "Upload files" tab if not already there
 	const uploadTab = page.locator( '.media-modal #menu-item-upload' );
@@ -153,17 +156,40 @@
 	const fileInput = page.locator( '.media-modal input[type="file"]' );
 	await fileInput.setInputFiles( imagePath );
 
-	// Wait for upload to complete
-	await page.waitForSelector( '.media-modal .attachment.selected', {
-		state: 'visible',
-		timeout: 15000,
-	} );
+	// Wait for upload to complete and ensure an attachment is selected.
+	try {
+		await page.waitForSelector( '.media-modal .attachment.selected', {
+			state: 'visible',
+			timeout: 60000,
+		} );
+	} catch {
+		await page.waitForSelector( '.media-modal .attachments .attachment', {
+			state: 'visible',
+			timeout: 60000,
+		} );
+		await page.locator( '.media-modal .attachments .attachment' ).first().click();
+		await page.waitForSelector( '.media-modal .attachment.selected', {
+			state: 'visible',
+			timeout: 15000,
+		} );
+	}
 
-	// Click "Select" button
-	const selectButton = page.locator(
-		'.media-modal .media-toolbar-primary .media-button-select'
-	);
-	await selectButton.click();
+	// Wait for "Select" to be enabled before clicking.
+	const selectButtonSelector =
+		'.media-modal .media-toolbar-primary .media-button-select:not([disabled])';
+	try {
+		await page.waitForSelector( selectButtonSelector, {
+			state: 'visible',
+			timeout: 60000,
+		} );
+	} catch {
+		await page.locator( '.media-modal .attachments .attachment' ).first().click();
+		await page.waitForSelector( selectButtonSelector, {
+			state: 'visible',
+			timeout: 30000,
+		} );
+	}
+	await page.locator( selectButtonSelector ).click();
 
 	// Wait for modal to close
 	await page.waitForSelector( '.media-modal', { state: 'hidden' } );

tests/e2e/field-type-image.spec.ts

@@ -9,6 +9,7 @@ const {
 	PLUGIN_SLUG,
 	deleteFieldGroups,
 	waitForMetaBoxes,
+	uploadImageViaModal,
 } = require( './field-helpers' );
 const path = require( 'path' );
 
@@ -81,34 +82,7 @@ test.describe( 'Field Type > Image', () => {
 			'.acf-field[data-name="test_image"] .acf-image-uploader[data-uploader="wp"] .acf-button-edit, .acf-field[data-name="test_image"] .acf-image-uploader a[data-name="add"]'
 		);
 		await addImageButton.click();
-
-		// Wait for media modal
-		await page.waitForSelector( '.media-modal', { state: 'visible' } );
-
-		// Click "Upload files" tab
-		const uploadTab = page.locator( '.media-modal #menu-item-upload' );
-		if ( await uploadTab.isVisible() ) {
-			await uploadTab.click();
-		}
-
-		// Upload the file
-		const fileInput = page.locator( '.media-modal input[type="file"]' );
-		await fileInput.setInputFiles( TEST_IMAGE_PATH );
-
-		// Wait for upload to complete
-		await page.waitForSelector( '.media-modal .attachment.selected', {
-			state: 'visible',
-			timeout: 30000,
-		} );
-
-		// Click "Select" button
-		const selectButton = page.locator(
-			'.media-modal .media-toolbar-primary .media-button-select'
-		);
-		await selectButton.click();
-
-		// Wait for modal to close
-		await page.waitForSelector( '.media-modal', { state: 'hidden' } );
+		await uploadImageViaModal( page, TEST_IMAGE_PATH );
 
 		// Verify image is displayed in the field
 		const imagePreview = page.locator(
@@ -174,28 +148,7 @@ test.describe( 'Field Type > Image', () => {
 			'.acf-field[data-name="removable_image"] .acf-image-uploader a[data-name="add"]'
 		);
 		await addImageButton.click();
-
-		await page.waitForSelector( '.media-modal', { state: 'visible' } );
-
-		const uploadTab = page.locator( '.media-modal #menu-item-upload' );
-		if ( await uploadTab.isVisible() ) {
-			await uploadTab.click();
-		}
-
-		const fileInput = page.locator( '.media-modal input[type="file"]' );
-		await fileInput.setInputFiles( TEST_IMAGE_PATH );
-
-		await page.waitForSelector( '.media-modal .attachment.selected', {
-			state: 'visible',
-			timeout: 30000,
-		} );
-
-		const selectButton = page.locator(
-			'.media-modal .media-toolbar-primary .media-button-select'
-		);
-		await selectButton.click();
-
-		await page.waitForSelector( '.media-modal', { state: 'hidden' } );
+		await uploadImageViaModal( page, TEST_IMAGE_PATH );
 
 		// Verify image is there
 		const imagePreview = page.locator(