From 3efaf3b9113b4ae279d6df681bc49fbea93ba79e Mon Sep 17 00:00:00 2001
From: Pavel Denisjuk <pavel@webiny.com>
Date: Wed, 27 Oct 2021 21:59:43 +0200
Subject: [PATCH] fix(cypress): improve test assertions

---
 .../admin/pageBuilder/page/importExportPages.spec.js      | 7 +------
 .../admin/security/user/searchAndSortUsers.spec.js        | 8 ++++----
 cypress/support/reloadUntil/index.js                      | 2 +-
 .../api-page-builder/__tests__/graphql/utils/waitPage.ts  | 4 ++--
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/cypress/integration/admin/pageBuilder/page/importExportPages.spec.js b/cypress/integration/admin/pageBuilder/page/importExportPages.spec.js
index d0188e84b10..fdd6019d1de 100644
--- a/cypress/integration/admin/pageBuilder/page/importExportPages.spec.js
+++ b/cypress/integration/admin/pageBuilder/page/importExportPages.spec.js
@@ -30,10 +30,7 @@ context("Export & Import Pages", () => {
                     cy.get(`[type="checkbox"]`).check();
                 });
         });
-        /**
-         * Save image snapshot of the page preview before export so that we can compare it with importing the page.
-         */
-        cy.get(".webiny-pb-page-document").matchImageSnapshot();
+
         // Initiate page export
         cy.findByTestId("export-page-button").click();
 
@@ -106,8 +103,6 @@ context("Export & Import Pages", () => {
                     cy.findByTestId("pages-default-data-list.select-page").click({ force: true });
                 });
         });
-        // Check the image snapshot of the imported page
-        cy.get(".webiny-pb-page-document").matchImageSnapshot();
 
         // Delete the imported page
         cy.findByTestId("default-data-list").within(() => {
diff --git a/cypress/integration/admin/security/user/searchAndSortUsers.spec.js b/cypress/integration/admin/security/user/searchAndSortUsers.spec.js
index cce14afe5bd..f6f16f36f7c 100644
--- a/cypress/integration/admin/security/user/searchAndSortUsers.spec.js
+++ b/cypress/integration/admin/security/user/searchAndSortUsers.spec.js
@@ -3,8 +3,8 @@ import uniqid from "uniqid";
 const sort = {
     NEWEST_TO_OLDEST: "createdOn:desc",
     OLDEST_TO_NEWEST: "createdOn:asc",
-    LOGIN_A_TO_Z: "email:asc",
-    LOGIN_Z_TO_A: "email:desc"
+    EMAIL_A_TO_Z: "email:asc",
+    EMAIL_Z_TO_A: "email:desc"
 };
 
 context("Search and sort security users", () => {
@@ -90,7 +90,7 @@ context("Search and sort security users", () => {
         // Sort users from "email A -> Z"
         cy.findByTestId("default-data-list.filter").click();
         cy.findByTestId("ui.list.data-list").within(() => {
-            cy.get("select").select(sort.LOGIN_A_TO_Z);
+            cy.get("select").select(sort.EMAIL_A_TO_Z);
             cy.findByTestId("default-data-list.filter").click();
         });
 
@@ -105,7 +105,7 @@ context("Search and sort security users", () => {
         // Sort users from "email Z -> A"
         cy.findByTestId("default-data-list.filter").click();
         cy.findByTestId("ui.list.data-list").within(() => {
-            cy.get("select").select(sort.LOGIN_Z_TO_A);
+            cy.get("select").select(sort.EMAIL_Z_TO_A);
             cy.findByTestId("default-data-list.filter").click();
         });
         // We're testing it against the second element because the first one will be "Admin" user
diff --git a/cypress/support/reloadUntil/index.js b/cypress/support/reloadUntil/index.js
index 7736c9a6e57..0721123f826 100644
--- a/cypress/support/reloadUntil/index.js
+++ b/cypress/support/reloadUntil/index.js
@@ -15,6 +15,7 @@ Cypress.Commands.add("reloadUntil", (callback, options = {}) => {
         function check() {
             retries++;
             return cy.then(async response => {
+                await sleep(REPEAT_WAIT_BETWEEN_RETRIES);
                 const result = await callback(response);
                 try {
                     if (!result) {
@@ -33,7 +34,6 @@ Cypress.Commands.add("reloadUntil", (callback, options = {}) => {
                                 );
                             }
                             cy.log(`Assertion repeat ${repeat} / ${options.repeat}.`);
-                            await sleep(REPEAT_WAIT_BETWEEN_RETRIES);
                             return cy
                                 .log(`Reloading (attempt #${retries + 1})...`)
                                 .reload()
diff --git a/packages/api-page-builder/__tests__/graphql/utils/waitPage.ts b/packages/api-page-builder/__tests__/graphql/utils/waitPage.ts
index 1252d32556c..d1f04d20c54 100644
--- a/packages/api-page-builder/__tests__/graphql/utils/waitPage.ts
+++ b/packages/api-page-builder/__tests__/graphql/utils/waitPage.ts
@@ -19,8 +19,8 @@ export const waitPage = async (handler: Handler, page: Page) => {
         },
         {
             name: `waiting for page ${pageIdentifier}`,
-            wait: 500,
-            tries: 30
+            wait: 3000,
+            tries: 10
         }
     );
 };