swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8147 from umbraco/v8/feature/stabilising-acceptance-tests

Browse Source 
Stabilising acceptance tests + Bugfix for hanging saves of media.
This commit is contained in:
Warren Buckley
2020-05-22 12:59:36 +00:00
committed by GitHub
parent c36495ac9c 1a04b9711b
commit 76e9d7b38c
4 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Tests.AcceptanceTest/cypress.json
+2 -1
View File
@@ -6,5 +6,6 @@
"username": "<insert username/email in cypress.env.json>",
"password": "<insert password in cypress.env.json>"
},
"supportFile": "cypress/support/index.ts"
"supportFile": "cypress/support/index.ts",
"videoUploadOnPasses" : false
}
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+38 -14
View File
@@ -1,4 +1,6 @@
/// <reference types="Cypress" />
import {DocumentTypeBuilder, TemplateBuilder} from "umbraco-cypress-testhelpers";
context('Templates', () => {
beforeEach(() => {
@@ -6,28 +8,50 @@ 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);
});
it('Delete template', () => {
const name = "Test template";
cy.umbracoEnsureTemplateNameNotExists(name);
const template = new TemplateBuilder()
.withName(name)
.build();
cy.saveTemplate(template);
cy.umbracoSection('settings');
cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
cy.umbracoTreeItem("settings", ["Templates", name]).rightclick();
cy.umbracoContextMenuAction("action-delete").click();
cy.umbracoButtonByLabelKey("general_ok").click();
cy.contains(name).should('not.exist');
cy.umbracoEnsureTemplateNameNotExists(name);
});
});
src/Umbraco.Tests.AcceptanceTest/package.json
+2 -2
View File
@@ -6,8 +6,8 @@
"devDependencies": {
"cross-env": "^7.0.2",
"ncp": "^2.0.0",
"cypress": "^4.5.0",
"umbraco-cypress-testhelpers": "1.0.0-beta-38"
"cypress": "^4.6.0",
"umbraco-cypress-testhelpers": "1.0.0-beta-39"
},
"dependencies": {
"typescript": "^3.9.2"
src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+8 -15
View File
@@ -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();