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

Merge branch 'v10/dev' into v10/feature/variant-permissions

Browse Source
This commit is contained in:
Mads Rasmussen
2022-08-03 11:22:35 +02:00
parent e5cbd15a7e c5654f0311
commit 31279b96cf
166 changed files with 4212 additions and 2750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
View File

@@ -792,4 +792,45 @@ context('Content', () => {
cy.umbracoEnsureMacroNameNotExists(macroName);
cy.umbracoEnsurePartialViewMacroFileNameNotExists(macroFileName);
});
it('Create content with the same name', () => {
const documentTypeName = "TestType";
const nodeName = "Home";
const expectedNodeName = nodeName + " (1)";
cy.umbracoEnsureDocumentTypeNameNotExists(documentTypeName);
cy.deleteAllContent();
const documentType = new DocumentTypeBuilder()
.withName(documentTypeName)
.withAllowAsRoot(true)
.build();
cy.saveDocumentType(documentType).then((generatedDocumentType) => {
const rootContentNode = new ContentBuilder()
.withAction("saveNew")
.withContentTypeAlias(generatedDocumentType["alias"])
.addVariant()
.withName(nodeName)
.withSave(true)
.done()
.build();
cy.saveContent(rootContentNode)
});
refreshContentTree();
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-create").click();
cy.get('.umb-action-link').contains(documentTypeName).click();
cy.umbracoEditorHeaderName(nodeName);
cy.umbracoButtonByLabelKey("buttons_saveAndPublish").click();
cy.umbracoSuccessNotification().should('be.visible');
cy.umbracoTreeItem("content", [expectedNodeName]).should('be.visible');
cy.umbracoEnsureDocumentTypeNameNotExists(documentTypeName);
cy.deleteAllContent();
});
});

17
tests/Umbraco.Tests.AcceptanceTest/cypress/integration/HelpPanel/systemInformation.ts
View File

@@ -20,7 +20,22 @@ context('System Information', () => {
it('Check System Info Displays', () => {
openSystemInformation();
cy.get('.table').find('tr').should('have.length', 13);
// Assert
cy.get('.table').find('tr').should('contain', 'Server OS');
cy.get('.table').find('tr').should('contain', 'Server Framework');
cy.get('.table').find('tr').should('contain', 'Default Language');
cy.get('.table').find('tr').should('contain', 'Umbraco Version');
cy.get('.table').find('tr').should('contain', 'Current Culture');
cy.get('.table').find('tr').should('contain', 'Current UI Culture');
cy.get('.table').find('tr').should('contain', 'Current Webserver');
cy.get('.table').find('tr').should('contain', 'Models Builder Mode');
cy.get('.table').find('tr').should('contain', 'Debug Mode');
cy.get('.table').find('tr').should('contain', 'Database Provider');
cy.get('.table').find('tr').should('contain', 'Current Server Role');
cy.get('.table').find('tr').should('contain', 'Browser');
cy.get('.table').find('tr').should('contain', 'Browser OS');
cy.contains('Default Language').parent().should('contain', 'en-US');
cy.contains('Current Culture').parent().should('contain', 'en-US');
cy.contains('Current UI Culture').parent().should('contain', 'en-US');
});