From 4a1dffcd24bfa5a5f8b87fd4db3634673c4d4d9d Mon Sep 17 00:00:00 2001
From: Zeegaan <70372949+Zeegaan@users.noreply.github.com>
Date: Tue, 21 Sep 2021 15:37:46 +0200
Subject: [PATCH] Update tabs.ts

---
 .../cypress/integration/Tabs/tabs.ts          | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts
index 3daf907c99..77729912a6 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts
@@ -379,7 +379,12 @@ context('Tabs', () => {
       cy.saveDocumentType(tabsDocType);
       OpenDocTypeFolder();
       cy.get('[alias="reorder"]').click();
-      cy.get('.umb-group-builder__tabs-overflow--right > .caret').click().click();
+      cy.get('body')
+      .then(($body) => {
+        while($body.find('.umb-group-builder__tabs-overflow--right > .caret').hasClass('active')){
+          cy.click();
+        }
+      });
       cy.get('.umb-group-builder__tab').last().click();
       cy.get('.umb-group-builder__group-title-icon').last().trigger('mousedown', { which: 1 })
       cy.get('.umb-group-builder__tab').eq(1).trigger('mousemove', {which: 1, force: true});
@@ -426,7 +431,12 @@ context('Tabs', () => {
       OpenDocTypeFolder();
       cy.get('[alias="reorder"]').click();
       //Scroll right so we can see tab 2
-      cy.get('.umb-group-builder__tabs-overflow--right > .caret').click().click();
+      cy.get('body')
+        .then(($body) => {
+          while($body.find('.umb-group-builder__tabs-overflow--right > .caret').hasClass('active')){
+            cy.click();
+          }
+        });
       cy.get('.umb-group-builder__tab-title-icon').eq(1).trigger('mousedown', { which: 1 })
       cy.get('.umb-group-builder__tab').eq(1).trigger('mousemove', {which: 1, force: true});
       cy.get('.umb-group-builder__tab').eq(1).should('have.class', 'is-active').trigger('mouseup', {force:true});
@@ -473,7 +483,12 @@ context('Tabs', () => {
       OpenDocTypeFolder();
       cy.get('[alias="reorder"]').click();
       //Scroll so we are sure we see tab 2
-      cy.get('.umb-group-builder__tabs-overflow--right > .caret').click().click();
+      cy.get('body')
+      .then(($body) => {
+        while($body.find('.umb-group-builder__tabs-overflow--right > .caret').hasClass('active')){
+          cy.click();
+        }
+      });
       //Navigate to tab 2
       cy.get('.umb-group-builder__tab').last().click();
       cy.get('.umb-group-builder__property-meta > .flex > .icon').eq(1).trigger('mousedown', {which: 1})