From a1209f9702ceae8779eccbec5cfea0d18b864434 Mon Sep 17 00:00:00 2001
From: Florian Giroud <6267288+fgiroud@users.noreply.github.com>
Date: Mon, 8 Feb 2021 14:47:52 +0100
Subject: [PATCH] Fix Flaky Cypress tests, Issue 3594 (#3595)

* Attempt to fix flaky tests
* Increased Cypress retries, removed retries for openMode
---
 main/tests/cypress/cypress.json                | 4 ++--
 main/tests/cypress/cypress/support/commands.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/main/tests/cypress/cypress.json b/main/tests/cypress/cypress.json
index 530806d01..4b8f38204 100644
--- a/main/tests/cypress/cypress.json
+++ b/main/tests/cypress/cypress.json
@@ -2,8 +2,8 @@
   "integrationFolder": "./cypress/integration",
   "nodeVersion": "system",
   "retries": {
-    "runMode": 2,
-    "openMode": 1
+    "runMode": 3,
+    "openMode": 0
   },
   "env": {
     "OPENREFINE_URL": "http://localhost:3333"
diff --git a/main/tests/cypress/cypress/support/commands.js b/main/tests/cypress/cypress/support/commands.js
index 50e572c2b..f91b52a7e 100644
--- a/main/tests/cypress/cypress/support/commands.js
+++ b/main/tests/cypress/cypress/support/commands.js
@@ -182,6 +182,7 @@ Cypress.Commands.add('confirmDialogPanel', () => {
  * Will click on a menu entry for a given column name
  */
 Cypress.Commands.add('columnActionClick', (columnName, actions) => {
+  cy.get('body[ajax_in_progress="false"]'); // OR must not be loading at the moment, column headers will be detached from the dom
   cy.get(
     '.data-table th:contains("' + columnName + '") .column-header-menu'
   ).click();