From 14c2bb4aa2a22ddc4d8a35e8eb61b7592c222fce Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 23 Mar 2021 13:03:01 +0100
Subject: [PATCH] Update cypress and fix tests

---
 .../cypress/integration/Settings/templates.ts             | 8 ++++++--
 .../cypress/integration/Tour/backofficeTour.ts            | 2 +-
 src/Umbraco.Tests.AcceptanceTest/package.json             | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index c586384af7..65d03e5a78 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -23,14 +23,18 @@ context('Templates', () => {
         cy.umbracoEnsureTemplateNameNotExists(name);
 
         createTemplate();
+        // We have to wait for the ace editor to load, because when the editor is loading it will "steal" the focus briefly,
+        // which causes the save event to fire if we've added something to the header field, causing errors.
+        cy.wait(500);
+
         //Type name
         cy.umbracoEditorHeaderName(name);
         // Save
         // We must drop focus for the auto save event to occur.
         cy.get('.btn-success').focus();
         // And then wait for the auto save event to finish by finding the page in the tree view.
-        // This is a bit of a roundabout way to find items in a treev view since we dont use umbracoTreeItem
-        // but we must be able to wait for the save evnent to finish, and we can't do that with umbracoTreeItem
+        // This is a bit of a roundabout way to find items in a tree view since we dont use umbracoTreeItem
+        // but we must be able to wait for the save event to finish, and we can't do that with umbracoTreeItem
         cy.get('[data-element="tree-item-templates"] > :nth-child(2) > .umb-animated > .umb-tree-item__inner > .umb-tree-item__label')
             .contains(name).should('be.visible', { timeout: 10000 });
         // Now that the auto save event has finished we can save
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
index 9bc1fff488..d3950d7d19 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
@@ -49,7 +49,7 @@ function resetTourData() {
     {
         "alias": "umbIntroIntroduction",
         "completed": false,
-        "disabled": false
+        "disabled": true
     };
 
     cy.getCookie('UMB-XSRF-TOKEN', { log: false }).then((token) => {
diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/src/Umbraco.Tests.AcceptanceTest/package.json
index 378fe719fc..069a1d85b7 100644
--- a/src/Umbraco.Tests.AcceptanceTest/package.json
+++ b/src/Umbraco.Tests.AcceptanceTest/package.json
@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.2",
-    "cypress": "^6.0.1",
+    "cypress": "^6.8.0",
     "ncp": "^2.0.0",
     "prompt": "^1.0.0",
     "umbraco-cypress-testhelpers": "^1.0.0-beta-52"