Ensure the actual tests environment is used for e2e tests (#70280)

westonruter · swissspidy · web-flow · commit 1acfccc02e91 · 2025-06-14T11:44:01.000-07:00
Co-authored-by: westonruter &lt;westonruter@git.wordpress.org&gt;
Co-authored-by: swissspidy &lt;swissspidy@git.wordpress.org&gt;
diff --git a/packages/env/lib/config/load-config.js b/packages/env/lib/config/load-config.js
@@ -37,7 +37,7 @@ const postProcessConfig = require( './post-process-config' );
  *
  * @param {string} configDirectoryPath The directory we want to load the config from.
  *
- * @return {WPConfig} The config object we've loaded.
+ * @return {Promise<WPConfig>} The config object we've loaded.
  */
 module.exports = async function loadConfig( configDirectoryPath ) {
 	const configFilePath = getConfigFilePath( configDirectoryPath );
diff --git a/packages/scripts/config/playwright.config.js b/packages/scripts/config/playwright.config.js
@@ -10,6 +10,8 @@ process.env.STORAGE_STATE_PATH ??= path.join(
 	'storage-states/admin.json'
 );
 
+const baseUrl = new URL( process.env.WP_BASE_URL || 'https://localhost:8889' );
+
 const config = defineConfig( {
 	reporter: process.env.CI ? [ [ 'github' ] ] : [ [ 'list' ] ],
 	forbidOnly: !! process.env.CI,
@@ -25,7 +27,7 @@ const config = defineConfig( {
 		'{testDir}/{testFileDir}/__snapshots__/{arg}-{projectName}{ext}',
 	globalSetup: require.resolve( './playwright/global-setup.js' ),
 	use: {
-		baseURL: process.env.WP_BASE_URL || 'https://localhost:8889',
+		baseURL: baseUrl.href,
 		headless: true,
 		viewport: {
 			width: 960,
@@ -45,7 +47,7 @@ const config = defineConfig( {
 	},
 	webServer: {
 		command: 'npm run wp-env start',
-		port: 8889,
+		port: baseUrl.port,
 		timeout: 120_000, // 120 seconds.
 		reuseExistingServer: true,
 	},
diff --git a/packages/scripts/scripts/test-playwright.js b/packages/scripts/scripts/test-playwright.js
@@ -14,6 +14,7 @@ process.on( 'unhandledRejection', ( err ) => {
  */
 const { resolve } = require( 'node:path' );
 const { sync: spawn } = require( 'cross-spawn' );
+const path = require( 'path' );
 
 /**
  * Internal dependencies
@@ -26,6 +27,11 @@ const {
 	getAsBooleanFromENV,
 } = require( '../utils' );
 
+/**
+ * Internal dependencies
+ */
+const loadConfig = require( '../../env/lib/config/load-config' );
+
 if ( ! getAsBooleanFromENV( 'PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD' ) ) {
 	const result = spawn( 'npx', [ 'playwright', 'install' ], {
 		stdio: 'inherit',
@@ -51,19 +57,25 @@ if ( ! process.env.WP_ARTIFACTS_PATH ) {
 	);
 }
 
-const testResult = spawn(
-	'node',
-	[
-		require.resolve( '@playwright/test/cli' ),
-		'test',
-		...config,
-		...getArgsFromCLI(),
-	],
-	{
-		stdio: 'inherit',
+loadConfig( path.resolve( '.' ) ).then( ( envConfig ) => {
+	if ( ! process.env.WP_BASE_URL ) {
+		process.env.WP_BASE_URL = `https://localhost:${ envConfig.env.tests.port }`;
 	}
-);
 
-if ( testResult.status > 0 ) {
-	process.exit( testResult.status );
-}
+	const testResult = spawn(
+		'node',
+		[
+			require.resolve( '@playwright/test/cli' ),
+			'test',
+			...config,
+			...getArgsFromCLI(),
+		],
+		{
+			stdio: 'inherit',
+		}
+	);
+
+	if ( testResult.status > 0 ) {
+		process.exit( testResult.status );
+	}
+} );

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ const postProcessConfig = require( './post-process-config' );`
`37`	`37`	`*`
`38`	`38`	`* @param {string} configDirectoryPath The directory we want to load the config from.`
`39`	`39`	`*`
`40`		`- * @return {WPConfig} The config object we've loaded.`
	`40`	`+ * @return {Promise<WPConfig>} The config object we've loaded.`
`41`	`41`	`*/`
`42`	`42`	`module.exports = async function loadConfig( configDirectoryPath ) {`
`43`	`43`	`const configFilePath = getConfigFilePath( configDirectoryPath );`