WordPress 6.7 compatibility / test coverage

.github/workflows/e2e-tests.yml

@@ -16,7 +16,7 @@ permissions: {}
 
 jobs:
     e2e-tests:
-        name: 'E2E Tests (${{ matrix.wp }}) (${{ matrix.shard }})'
+        name: E2E Tests (${{ matrix.wp }}${{ matrix.gb && ' + GB ' }}) (${{ matrix.shard }})
         runs-on: ubuntu-latest
         continue-on-error: ${{ matrix.experimental == true }}
         strategy:
@@ -38,6 +38,22 @@ jobs:
                     - wp: 'trunk'
                       shard: '4/4'
                       experimental: true
+                    - wp: 'trunk'
+                      gb: true
+                      shard: '1/4'
+                      experimental: true
+                    - wp: 'trunk'
+                      gb: true
+                      shard: '2/4'
+                      experimental: true
+                    - wp: 'trunk'
+                      gb: true
+                      shard: '3/4'
+                      experimental: true
+                    - wp: 'trunk'
+                      gb: true
+                      shard: '4/4'
+                      experimental: true
 
         steps:
             - name: Checkout
@@ -71,8 +87,14 @@ jobs:
 
                   chmod -R 767 ./
                   npm run wp-env start
+
+                  if [[ $GUTENBERG != 'true' ]]; then
+                    echo "Deactivating Gutenberg plugin"
+                    npm run wp-env --silent -- run tests-cli wp plugin deactivate gutenberg
+                  fi
               env:
                   WP_VERSION: ${{ matrix.wp }}
+                  GUTENBERG: ${{ matrix.gb == 'true' }}
 
             - name: Run tests
               run: |
@@ -94,7 +116,7 @@ jobs:
                   ARTIFACT_NAME=${ARTIFACT_NAME//\//-}
                   echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV
               env:
-                  ARTIFACT_NAME: failures-artifacts-${{ matrix.wp }}-${{ matrix.shard }}
+                  ARTIFACT_NAME: failures-artifacts-${{ matrix.wp }}${{ matrix.gb && '-gb' }}-${{ matrix.shard }}
 
             - name: Archive debug artifacts (screenshots, HTML snapshots)
               uses: actions/upload-artifact@v4

.wp-env.json

@@ -1,6 +1,9 @@
 {
 	"core": null,
-	"plugins": [ "." ],
+	"plugins": [
+		".",
+		"https://downloads.wordpress.org/plugin/gutenberg.latest-stable.zip"
+	],
 	"mappings": {
 		"wp-content/mu-plugins": "./tests/e2e/mu-plugins"
 	},

packages/editor/src/block-media-panel/add-poster.tsx

@@ -34,7 +34,9 @@
 }
 
 export function AddPoster( { attributes, setAttributes }: AddPosterProps ) {
-	const { baseControlProps, controlProps } = useBaseControlProps( {} );
+	const { baseControlProps, controlProps } = useBaseControlProps( {
+		__nextHasNoMarginBottom: true,
+	} );
 
 	const [ posterId, setPosterId ] = useState< number | undefined >();
 

packages/editor/src/block-media-panel/audio-controls.tsx

@@ -39,6 +39,8 @@ export function AudioControls( props: AudioControlsProps ) {
 		if ( url ) {
 			props.setAttributes( {
 				src: url,
+				// New local attribute in WordPress 6.7.
+				blob: url,
 			} );
 		}
 	}

packages/editor/src/block-media-panel/debug-info.tsx

@@ -65,7 +65,9 @@
 }
 
 export function DebugInfo( { id }: DebugInfoProps ) {
-	const { baseControlProps, controlProps } = useBaseControlProps( {} );
+	const { baseControlProps, controlProps } = useBaseControlProps( {
+		__nextHasNoMarginBottom: true,
+	} );
 
 	const { record: attachment } = useEntityRecord< RestAttachment | null >(
 		'postType',

packages/editor/src/block-media-panel/generate-subtitles.tsx

@@ -32,7 +32,9 @@
 	attributes,
 	setAttributes,
 }: GenerateSubtitlesProps ) {
-	const { baseControlProps, controlProps } = useBaseControlProps( {} );
+	const { baseControlProps, controlProps } = useBaseControlProps( {
+		__nextHasNoMarginBottom: true,
+	} );
 
 	const { record: post } = useEntityRecord< RestAttachment | null >(
 		'postType',

packages/editor/src/block-media-panel/image-controls.tsx

@@ -45,6 +45,8 @@ export function ImageControls( props: ImageControlsProps ) {
 		if ( url ) {
 			props.setAttributes( {
 				url,
+				// New local attribute in WordPress 6.7.
+				blob: url,
 			} );
 		}
 	}

packages/editor/src/block-media-panel/import-media.tsx

@@ -34,7 +34,9 @@
 	onChange,
 	allowedTypes,
 }: ImportMediaProps ) {
-	const { baseControlProps, controlProps } = useBaseControlProps( {} );
+	const { baseControlProps, controlProps } = useBaseControlProps( {
+		__nextHasNoMarginBottom: true,
+	} );
 
 	const { addItemFromUrl } = useDispatch( uploadStore );
 	const { createErrorNotice } = useDispatch( noticesStore );

packages/editor/src/block-media-panel/mute-video.tsx

@@ -30,7 +30,9 @@
 }
 
 export function MuteVideo( { id, url, poster, onChange }: MuteVideoProps ) {
-	const { baseControlProps, controlProps } = useBaseControlProps( {} );
+	const { baseControlProps, controlProps } = useBaseControlProps( {
+		__nextHasNoMarginBottom: true,
+	} );
 
 	const { record: post } = useEntityRecord< RestAttachment | null >(
 		'postType',

packages/editor/src/block-media-panel/recording-controls.tsx

@@ -210,9 +210,8 @@
 									void startRecording();
 								}
 							} }
-							extraProps={ {
-								disabled: ! isReady && ! isRecording,
-							} }
+							disabled={ ! isReady && ! isRecording }
+							accessibleWhenDisabled={ true }
 							icon={
 								! isRecordingOrCountdown ? (
 									<StartRecording
@@ -244,9 +243,8 @@
 									void resumeRecording();
 								}
 							} }
-							extraProps={ {
-								disabled: ! isRecording && ! isPaused,
-							} }
+							disabled={ ! isRecording && ! isPaused }
+							accessibleWhenDisabled={ true }
 							icon={
 								isPaused ? (
 									<ResumeRecording
@@ -261,7 +259,7 @@
 								)
 							}
 							label={
-								isRecording
+								! isPaused
 									? __(
 											'Pause recording',
 											'media-experiments'
@@ -332,7 +330,9 @@
 	onInsert,
 	recordingTypes,
 }: RecordingControlsProps ) {
-	const { baseControlProps, controlProps } = useBaseControlProps( {} );
+	const { baseControlProps, controlProps } = useBaseControlProps( {
+		__nextHasNoMarginBottom: true,
+	} );
 
 	const { enterRecordingMode, leaveRecordingMode } =
 		useDispatch( recordingStore );

packages/editor/src/block-media-panel/upload-requests/controls.tsx

@@ -41,7 +41,9 @@
 const UPLOAD_REQUEST_MAX_LIFETIME = 15 * 60; // Seconds.
 
 export function UploadRequestControls( props: UploadRequestControlsProps ) {
-	const { baseControlProps, controlProps } = useBaseControlProps( {} );
+	const { baseControlProps, controlProps } = useBaseControlProps( {
+		__nextHasNoMarginBottom: true,
+	} );
 
 	const { openModal, closeModal } = useDispatch( interfaceStore );
 	// @ts-ignore -- invalidateResolution is not yet exposed in GB types.

packages/editor/src/block-media-panel/video-controls.tsx

@@ -56,6 +56,8 @@ export function VideoControls( props: VideoControlsProps ) {
 		if ( url ) {
 			props.setAttributes( {
 				src: url,
+				// New local attribute in WordPress 6.7.
+				blob: url,
 			} );
 		}
 	}

packages/editor/src/components/bulk-optimization/index.tsx

@@ -267,7 +267,9 @@
 }: {
 	attachments: BulkOptimizationAttachmentData[];
 } ) {
-	const { baseControlProps, controlProps } = useBaseControlProps( {} );
+	const { baseControlProps, controlProps } = useBaseControlProps( {
+		__nextHasNoMarginBottom: true,
+	} );
 
 	const [ isBulkUploading, setIsBulkUploading ] = useState( false );
 

packages/editor/src/types.ts

@@ -19,18 +19,24 @@ import type { BlockInstance, BlockEditProps } from '@wordpress/blocks';
 export type ImageBlock = BlockInstance< {
 	id: number;
 	url: string;
+	// New local attribute in WordPress 6.7.
+	blob: string;
 	caption: string;
 	alt: string;
 } > & { name: 'core/image' };
 
 export type AudioBlock = BlockInstance< {
 	id: number;
 	src: string;
+	// New local attribute in WordPress 6.7.
+	blob: string;
 } > & { name: 'core/audio' };
 
 export type VideoBlock = BlockInstance< {
 	id: number;
 	src: string;
+	// New local attribute in WordPress 6.7.
+	blob: string;
 	poster: string;
 	muted: boolean;
 	caption: string;