Merge pull request #5310 from Automattic/develop

Staging release: v20240305.1

.github/actions/run-wp-tests/action.yml

@@ -41,6 +41,10 @@ inputs:
     description: The port of the MySQL server.
     required: false
     default: '3306'
+  codecov-token:
+    description: The token to use for CodeCov.
+    required: false
+    default: ''
 runs:
   using: composite
   steps:
@@ -57,7 +61,7 @@ runs:
         fi
 
     - name: Set up PHP
-      uses: shivammathur/setup-php@2.29.0
+      uses: shivammathur/setup-php@2.30.0
       with:
         coverage: ${{ steps.coverage.outputs.coverage }}
         ini-values: ${{ steps.coverage.outputs.ini }}
@@ -73,7 +77,7 @@ runs:
       if: inputs.phpunit != ''
 
     - name: Install PHP Dependencies
-      uses: ramsey/composer-install@2.2.0
+      uses: ramsey/composer-install@3.0.0
 
     - name: Set up WordPress and WordPress Test Library
       uses: sjinks/[email protected]
@@ -122,8 +126,9 @@ runs:
         "${PHPUNIT}" ${OPTIONS}
 
     - name: Upload coverage report
-      uses: codecov/codecov-action@v4.0.0
+      uses: codecov/codecov-action@v4.1.0
       with:
         files: ${{ inputs.coverage-file }}
         flags: ${{ inputs.coverage-flags }}
-      if: ${{ steps.coverage.outputs.coverage != 'none' }}
+        token: ${{ inputs.codecov-token }}
+      if: ${{ steps.coverage.outputs.coverage != 'none' && inputs.codecov-token != '' }}

.github/workflows/changelog-summary-prod.yml

@@ -64,10 +64,10 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.29.0
+        uses: shivammathur/setup-php@2.30.0
 
       - name: Install
-        uses: ramsey/composer-install@2.2.0
+        uses: ramsey/composer-install@3.0.0
 
       - name: Execute
         env:

.github/workflows/changelog-summary-staging.yml

@@ -19,10 +19,10 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.29.0
+        uses: shivammathur/setup-php@2.30.0
 
       - name: Install
-        uses: ramsey/composer-install@2.2.0
+        uses: ramsey/composer-install@3.0.0
 
       - name: Execute
         env:

.github/workflows/ci.yml

@@ -78,3 +78,4 @@ jobs:
           php: ${{ matrix.config.php }}
           phpunit: ${{ matrix.config.phpunit }}
           coverage: ${{ matrix.config.coverage }}
+          codecov-token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/core-tests.yml

@@ -67,7 +67,7 @@ jobs:
           cache-dependency-path: 'wordpress/package-lock.json'
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.29.0
+        uses: shivammathur/setup-php@2.30.0
         with:
           php-version: 8.0
           coverage: none

.github/workflows/coverage-develop.yml

@@ -51,3 +51,4 @@ jobs:
           jetpack: ${{ matrix.config.jp }}
           php: ${{ matrix.config.php }}
           coverage: 'yes'
+          codecov-token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/lint.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.29.0
+        uses: shivammathur/setup-php@2.30.0
         with:
           coverage: none
         env:
@@ -41,7 +41,7 @@ jobs:
           cache: npm
 
       - name: Install PHP Dependencies
-        uses: ramsey/composer-install@2.2.0
+        uses: ramsey/composer-install@3.0.0
 
       - name: Lint files
         run: npm run lint

__tests__/e2e/specs/page__edit.spec.ts

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { expect, test } from '@playwright/test';
+import { test } from '@playwright/test';
 
 /**
  * Internal dependencies
@@ -31,16 +31,22 @@ test.beforeAll( async ( { request } ) => {
 		body: bodyText,
 		postType: 'page',
 	} );
+
+	if ( ! response.ok() ) {
+		throw new Error( `Failed to create a new page. HTTP error: ${ response.status() }` );
+	}
+
 	const responseJSON = await response.json() as JSONResponse;
 	postID = responseJSON.id;
 	postURL = responseJSON.link;
-	expect( response.ok() ).toBeTruthy();
 } );
 
 test.afterAll( async ( { request } ) => {
 	// Delete created page
 	const response = await WPAPIHelper.deletePost( request, postID, 'page' );
-	expect( response.ok() ).toBeTruthy();
+	if ( ! response.ok() ) {
+		throw new Error( `Failed to delete the page. HTTP error: ${ response.status() }` );
+	}
 } );
 
 // eslint-disable-next-line playwright/expect-expect

__tests__/e2e/specs/post__edit.spec.ts

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { expect, test } from '@playwright/test';
+import { test } from '@playwright/test';
 
 /**
  * Internal dependencies
@@ -31,16 +31,22 @@ test.beforeAll( async ( { request } ) => {
 		body: bodyText,
 		postType: 'post',
 	} );
+
+	if ( ! response.ok() ) {
+		throw new Error( `Failed to create a new post. HTTP error: ${ response.status() }` );
+	}
+
 	const responseJSON = await response.json() as JSONResponse;
 	postID = responseJSON.id;
 	postURL = responseJSON.link;
-	expect( response.ok() ).toBeTruthy();
 } );
 
 test.afterAll( async ( { request } ) => {
 	// Delete created page
 	const response = await WPAPIHelper.deletePost( request, postID, 'post' );
-	expect( response.ok() ).toBeTruthy();
+	if ( ! response.ok() ) {
+		throw new Error( `Failed to delete the page. HTTP error: ${ response.status() }` );
+	}
 } );
 
 // eslint-disable-next-line playwright/expect-expect