Fix and improve some e2e tests

tests/cypress/integration/features/comments.cy.js

@@ -273,29 +273,49 @@ describe('Comments Feature', { tags: '@slow' }, () => {
 		cy.visit('/');
 		cy.contains('#main .entry-title a', 'Test Comment').first().click();
 		cy.get('#comment').type('This is a anonymous comment');
-		cy.get('#submit').click();
-
-		// start sync and test results.
-		cy.wpCli('wp elasticpress index')
-			.its('stdout')
-			.should('contain', `Number of comments indexed: ${defaultApprovedComments}`);
+		cy.get('#submit')
+			.click()
+			.then(() => {
+				cy.wpCli('wp elasticpress sync')
+					.its('stdout')
+					.should('contain', `Number of comments indexed: ${defaultApprovedComments}`);
+			});
 
 		// approve the comment
 		cy.visitAdminPage('edit-comments.php?comment_status=moderated');
-		cy.get('.approve a').first().click({ force: true });
-
-		// Check the number of comments.
-		cy.wpCli('wp elasticpress stats')
-			.its('stdout')
-			.should('contain', `Documents:  ${defaultApprovedComments + 1}`);
+		cy.get('.approve a')
+			.first()
+			.click({ force: true })
+			.then(() => {
+				/**
+				 * Give Elasticsearch some time to process the post.
+				 *
+				 */
+				// eslint-disable-next-line cypress/no-unnecessary-waiting
+				cy.wait(2000);
+
+				cy.wpCli('wp elasticpress stats')
+					.its('stdout')
+					.should('contain', `Documents:  ${defaultApprovedComments + 1}`);
+			});
 
 		// trash the comment
 		cy.visitAdminPage('edit-comments.php?comment_status=approved');
-		cy.get('.column-comment .trash a').first().click({ force: true });
-
-		cy.wpCli('wp elasticpress stats')
-			.its('stdout')
-			.should('contain', `Documents:  ${defaultApprovedComments}`);
+		cy.get('.column-comment .trash a')
+			.first()
+			.click({ force: true })
+			.then(() => {
+				/**
+				 * Give Elasticsearch some time to process the post.
+				 *
+				 */
+				// eslint-disable-next-line cypress/no-unnecessary-waiting
+				cy.wait(2000);
+
+				cy.wpCli('wp elasticpress stats')
+					.its('stdout')
+					.should('contain', `Documents:  ${defaultApprovedComments}`);
+			});
 	});
 
 	it('Can sync woocommerce reviews', () => {