Add some fixes

WordPress · Nov 6, 2023 · 88aecd6 · 88aecd6
1 parent cca5dd3
commit 88aecd6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -166,9 +166,7 @@ jobs:
         run: |
           npm run env:cli -- language core install de_DE --path=/var/www/${{ env.LOCAL_DIR }}
           npm run env:cli -- language plugin install de_DE --all --path=/var/www/${{ env.LOCAL_DIR }}
-          npm run env:cli -- language plugin update de_DE --all --path=/var/www/${{ env.LOCAL_DIR }}
           npm run env:cli -- language theme install de_DE --all --path=/var/www/${{ env.LOCAL_DIR }}
-          npm run env:cli -- language theme update de_DE --all --path=/var/www/${{ env.LOCAL_DIR }}
 
       - name: Install MU plugin
         run: |

diff --git a/tests/performance/compare-results.js b/tests/performance/compare-results.js
@@ -141,6 +141,9 @@ console.log( 'Note: Due to the nature of how GitHub Actions work, some variance
  * @param {number} value
  */
 function formatValue( metric, value) {
+	if ( null === value ) {
+		return 'N/A';
+	}
 	if ( 'wpMemoryUsage' === metric ) {
 		return `${ ( value / Math.pow( 10, 6 ) ).toFixed( 2 ) } MB`;
 	}
@@ -161,9 +164,9 @@ for ( const key of testSuites ) {
 
 	for ( const [ metric, values ] of Object.entries( current ) ) {
 		const value = median( values );
-		const prevValue = median( prev[ metric ] );
+		const prevValue = prev[ metric ] ? median( prev[ metric ] ) : null;
 
-		const delta = value - prevValue;
+		const delta = null !== prevValue ? value - prevValue : 0
 		const percentage = ( delta / value ) * 100;
 		rows.push( {
 			Metric: metric,

diff --git a/tests/performance/results.js b/tests/performance/results.js
@@ -8,6 +8,8 @@ const { join } = require( 'node:path' );
 const { median, getResultsFilename } = require( './utils' );
 
 const testSuites = [
+	'admin',
+	'admin-l10n',
     'home-classic-theme',
     'home-classic-theme-l10n',
     'home-block-theme',

diff --git a/tests/performance/specs/admin-l10n.test.js b/tests/performance/specs/admin-l10n.test.js
@@ -10,8 +10,6 @@ import { camelCaseDashes } from '../utils';
 
 const results = {
 	timeToFirstByte: [],
-	largestContentfulPaint: [],
-	lcpMinusTtfb: [],
 };
 
 test.describe( 'Admin (L10N)', () => {
@@ -39,10 +37,10 @@ test.describe( 'Admin (L10N)', () => {
 	const iterations = Number( process.env.TEST_RUNS );
 	for ( let i = 1; i <= iterations; i++ ) {
 		test( `Measure load time metrics (${ i } of ${ iterations })`, async ( {
-			page,
+			admin,
 			metrics,
 		} ) => {
-			await page.goto( '/' );
+			await admin.visitAdminPage( '/' );
 
 			const serverTiming = await metrics.getServerTiming();
 

diff --git a/tests/performance/specs/admin.test.js b/tests/performance/specs/admin.test.js
@@ -10,8 +10,6 @@ import { camelCaseDashes } from '../utils';
 
 const results = {
 	timeToFirstByte: [],
-	largestContentfulPaint: [],
-	lcpMinusTtfb: [],
 };
 
 test.describe( 'Admin', () => {
@@ -33,10 +31,10 @@ test.describe( 'Admin', () => {
 	const iterations = Number( process.env.TEST_RUNS );
 	for ( let i = 1; i <= iterations; i++ ) {
 		test( `Measure load time metrics (${ i } of ${ iterations })`, async ( {
-			page,
+			admin,
 			metrics,
 		} ) => {
-			await page.goto( '/' );
+			await admin.visitAdminPage( '/' );
 
 			const serverTiming = await metrics.getServerTiming();
 

diff --git a/tests/performance/wp-content/mu-plugins/server-timing.php b/tests/performance/wp-content/mu-plugins/server-timing.php
@@ -25,6 +25,9 @@ static function () use ( $server_timing_values, $template_start ) {
 
 				$server_timing_values['total'] = $server_timing_values['before-template'] + $server_timing_values['template'];
 
+				// While values passed via Server-Timing are intended to be durations,
+				// any numeric value can actually be passed.
+				// This is a nice little trick as it allows to easily get this information in JS.
 				$server_timing_values['memory-usage'] = memory_get_usage();
 
 				$header_values = array();