From 5b7f1227f9b4f97ede6e2799a1aa36bb9c4fd823 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 22 May 2020 10:46:13 +0200
Subject: [PATCH] Bugfix for issue with hanging saves. + Fix for double post of
 save templates

---
 .../cypress/integration/Settings/templates.ts | 28 +++++++++----------
 src/Umbraco.Tests.AcceptanceTest/package.json |  2 +-
 .../NuCache/PublishedSnapshotService.cs       | 23 ++++++---------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index bbabbcb4bf..c135258ec5 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -6,28 +6,28 @@ context('Templates', () => {
   });
 
   it('Create template', () => {
-    const name = "Test template";
+        const name = "Test template";
 
-   cy.umbracoEnsureTemplateNameNotExists(name);
+        cy.umbracoEnsureTemplateNameNotExists(name);
 
-    cy.umbracoSection('settings');
-    cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+        cy.umbracoSection('settings');
+        cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
 
-    cy.umbracoTreeItem("settings", ["Templates"]).rightclick();
+        cy.umbracoTreeItem("settings", ["Templates"]).rightclick();
 
-    cy.umbracoContextMenuAction("action-create").click();
+        cy.umbracoContextMenuAction("action-create").click();
 
-    //Type name
-    cy.umbracoEditorHeaderName(name);
+        //Type name
+        cy.umbracoEditorHeaderName(name);
 
-    //Save
-    cy.get('.btn-success').click();
+        //Save
+        cy.get("form[name='contentForm']").submit();
 
-    //Assert
-    cy.umbracoSuccessNotification().should('be.visible');
+        //Assert
+        cy.umbracoSuccessNotification().should('be.visible');
 
-    //Clean up
-    cy.umbracoEnsureTemplateNameNotExists(name);
+        //Clean up
+        cy.umbracoEnsureTemplateNameNotExists(name);
    });
 
 });
diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/src/Umbraco.Tests.AcceptanceTest/package.json
index daa1c424bb..997de4db77 100644
--- a/src/Umbraco.Tests.AcceptanceTest/package.json
+++ b/src/Umbraco.Tests.AcceptanceTest/package.json
@@ -6,7 +6,7 @@
   "devDependencies": {
     "cross-env": "^7.0.2",
     "ncp": "^2.0.0",
-    "cypress": "^4.5.0",
+    "cypress": "^4.6.0",
     "umbraco-cypress-testhelpers": "1.0.0-beta-38"
   },
   "dependencies": {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 7e78b2e96f..a39e26e2b1 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -882,22 +882,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // they require.
 
                 // These can be run side by side in parallel.
+                using (_contentStore.GetScopedWriteLock(_scopeProvider))
+                {
+                    NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) }, out _, out _);
+                }
 
-                Parallel.Invoke(
-                    () =>
-                    {
-                        using (_contentStore.GetScopedWriteLock(_scopeProvider))
-                        {
-                            NotifyLocked(new[] { new ContentCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) }, out _, out _);
-                        }
-                    },
-                    () =>
-                    {
-                        using (_mediaStore.GetScopedWriteLock(_scopeProvider))
-                        {
-                            NotifyLocked(new[] { new MediaCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) }, out _);
-                        }
-                    });
+                using (_mediaStore.GetScopedWriteLock(_scopeProvider))
+                {
+                    NotifyLocked(new[] { new MediaCacheRefresher.JsonPayload(0, null, TreeChangeTypes.RefreshAll) }, out _);
+                }
             }
 
             ((PublishedSnapshot)CurrentPublishedSnapshot)?.Resync();