Merge pull request #3053 from 10up/fix-intermittent-tests-fails

Fix Cypress intermittent tests fails

tests/cypress/integration/features/facets.spec.js

@@ -51,7 +51,13 @@ describe('Facets Feature', () => {
 		cy.openBlockSettingsSidebar();
 		cy.get('.block-editor-block-inspector select').select('post_tag');
 		cy.get('.block-editor-block-inspector input[type="radio"][value="name"]').click();
+
+		// Make sure it waits for the correct request.
+		cy.intercept('/wp-json/elasticpress/v1/facets/block-preview*orderby=name&order=asc*').as(
+			'blockPreview1',
+		);
 		cy.get('.block-editor-block-inspector input[type="radio"][value="asc"]').click();
+		cy.wait('@blockPreview1');
 
 		/**
 		 * Verify the block has the expected output in the editor based on the
@@ -321,7 +327,12 @@ describe('Facets Feature', () => {
 			cy.get('.block-editor-block-inspector input[type="text"]').clearThenType(
 				'Search Meta 1',
 			);
+
+			cy.intercept(
+				'/wp-json/elasticpress/v1/facets/meta/block-preview*facet=meta_field_1*',
+			).as('blockPreview1');
 			cy.get('.block-editor-block-inspector select').select('meta_field_1');
+			cy.wait('@blockPreview1');
 
 			/**
 			 * Verify that the blocks are inserted into the editor, and contain the
@@ -345,7 +356,12 @@ describe('Facets Feature', () => {
 			);
 			cy.get('.block-editor-block-inspector select').select('meta_field_2');
 			cy.get('.block-editor-block-inspector input[type="radio"][value="name"]').click();
+
+			cy.intercept(
+				'/wp-json/elasticpress/v1/facets/meta/block-preview*orderby=name&order=asc*',
+			).as('blockPreview2');
 			cy.get('.block-editor-block-inspector input[type="radio"][value="asc"]').click();
+			cy.wait('@blockPreview2');
 
 			/**
 			 * Verify the block has the expected output in the editor based on the

tests/cypress/integration/features/woocommerce.spec.js

@@ -143,6 +143,13 @@ describe('WooCommerce Feature', () => {
 		// ensure order is placed.
 		cy.url().should('include', '/checkout/order-received');
 
+		/**
+		 * Give Elasticsearch some time to process the new posts.
+		 *
+		 */
+		// eslint-disable-next-line cypress/no-unnecessary-waiting
+		cy.wait(2000);
+
 		// ensure order is visible to user.
 		cy.visit('my-account/orders');
 		cy.get('.woocommerce-orders-table tbody tr').should('have.length', 1);