Merge branch 'main' into release/3.8.5

bluehost · Feb 23, 2024 · c216e74 · c216e74
2 parents 0f3d51e + a62af0d
commit c216e74
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
@@ -58,7 +58,26 @@ Cypress.Commands.add( 'logout', () => {
 Cypress.Commands.add(
 	'setPermalinkStructure',
 	( structure = '/%postname%/' ) => {
-		cy.exec( `npx wp-env run cli wp rewrite structure "${ structure }"` );
+		cy.request({
+			method: 'GET',
+			url: '/wp-json/',
+			failOnStatusCode: false,
+		}).then(result => {
+			if(result.isOkStatusCode) {
+				return;
+			}
+			const permalinkWpCliCommand = `wp rewrite structure "${structure}" --hard;`;
+			const permalinkWpEnvCommand = `npx wp-env run cli ${permalinkWpCliCommand}`;
+			const permalinkWpEnvTestCommand = `npx wp-env run tests-cli ${permalinkWpCliCommand}`;
+			cy.exec( permalinkWpEnvCommand, {failOnNonZeroExit: true})
+				.then((result) => {
+					cy.request('/wp-json/');
+				});
+			cy.exec( permalinkWpEnvTestCommand, {failOnNonZeroExit: true})
+				.then((result) => {
+					cy.request('/wp-json/');
+				});
+		});
 	}
 );