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

Merge remote-tracking branch 'origin/v8/dev' into netcore/merge_umbraco_id_into_netcore_dev

Browse Source
This commit is contained in:
Bjarke Berg
2020-10-21 10:23:13 +02:00
parent 85718e9b86 7514e582f6
commit e840c578f1
5 changed files with 169 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
View File

@@ -1,11 +1,19 @@
/// <reference types="Cypress" />
import { DocumentTypeBuilder, ContentBuilder } from 'umbraco-cypress-testhelpers';
import { DocumentTypeBuilder, ContentBuilder, AliasHelper } from 'umbraco-cypress-testhelpers';
context('Content', () => {
beforeEach(() => {
cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
});
function refreshContentTree(){
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
// We have to wait in case the execution is slow, otherwise we'll try and click the item before it appears in the UI
cy.get('.umb-tree-item__inner').should('exist', {timeout: 10000});
}
it('Copy content', () => {
const rootDocTypeName = "Test document type";
const childDocTypeName = "Child test document type";
@@ -40,8 +48,8 @@ context('Content', () => {
.withContentTypeAlias(rootDocTypeAlias)
.withAction("saveNew")
.addVariant()
.withName(nodeName)
.withSave(true)
.withName(nodeName)
.withSave(true)
.done()
.build();
@@ -52,8 +60,8 @@ context('Content', () => {
.withAction("saveNew")
.withParent(contentNode["id"])
.addVariant()
.withName(childNodeName)
.withSave(true)
.withName(childNodeName)
.withSave(true)
.done()
.build();
@@ -64,8 +72,8 @@ context('Content', () => {
.withContentTypeAlias(rootDocTypeAlias)
.withAction("saveNew")
.addVariant()
.withName(anotherNodeName)
.withSave(true)
.withName(anotherNodeName)
.withSave(true)
.done()
.build();
@@ -74,8 +82,7 @@ context('Content', () => {
});
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
refreshContentTree();
// Copy node
cy.umbracoTreeItem("content", [nodeName, childNodeName]).rightclick({ force: true });
@@ -125,8 +132,8 @@ context('Content', () => {
.withContentTypeAlias(rootDocTypeAlias)
.withAction("saveNew")
.addVariant()
.withName(nodeName)
.withSave(true)
.withName(nodeName)
.withSave(true)
.done()
.build();
@@ -137,8 +144,8 @@ context('Content', () => {
.withAction("saveNew")
.withParent(contentNode["id"])
.addVariant()
.withName(childNodeName)
.withSave(true)
.withName(childNodeName)
.withSave(true)
.done()
.build();
@@ -149,8 +156,8 @@ context('Content', () => {
.withContentTypeAlias(rootDocTypeAlias)
.withAction("saveNew")
.addVariant()
.withName(anotherNodeName)
.withSave(true)
.withName(anotherNodeName)
.withSave(true)
.done()
.build();
@@ -159,8 +166,7 @@ context('Content', () => {
});
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
refreshContentTree();
// Move node
cy.umbracoTreeItem("content", [nodeName, childNodeName]).rightclick({ force: true });
@@ -209,8 +215,8 @@ context('Content', () => {
.withContentTypeAlias(generatedRootDocType["alias"])
.withAction("saveNew")
.addVariant()
.withName(nodeName)
.withSave(true)
.withName(nodeName)
.withSave(true)
.done()
.build();
@@ -223,8 +229,8 @@ context('Content', () => {
.withAction("saveNew")
.withParent(parentId)
.addVariant()
.withName(firstChildNodeName)
.withSave(true)
.withName(firstChildNodeName)
.withSave(true)
.done()
.build();
@@ -236,8 +242,8 @@ context('Content', () => {
.withAction("saveNew")
.withParent(parentId)
.addVariant()
.withName(secondChildNodeName)
.withSave(true)
.withName(secondChildNodeName)
.withSave(true)
.done()
.build();
@@ -247,8 +253,7 @@ context('Content', () => {
});
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
refreshContentTree();
// Sort nodes
cy.umbracoTreeItem("content", [nodeName]).rightclick({ force: true });
@@ -288,8 +293,8 @@ context('Content', () => {
const rootContentNode = new ContentBuilder()
.withContentTypeAlias(generatedRootDocType["alias"])
.addVariant()
.withName(initialNodeName)
.withSave(true)
.withName(initialNodeName)
.withSave(true)
.done()
.build();
@@ -297,8 +302,7 @@ context('Content', () => {
});
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
refreshContentTree();
// Access node
cy.umbracoTreeItem("content", [initialNodeName]).click();
@@ -309,15 +313,16 @@ context('Content', () => {
// Save and publish
cy.get('.btn-success').first().click();
cy.umbracoSuccessNotification().should('be.visible');
// Rollback
cy.get('.umb-box-header :button').click();
cy.get('.umb-box-content > .ng-scope > .input-block-level')
cy.get('.umb-box-content > div > .input-block-level')
.find('option[label*=' + new Date().getDate() + ']')
.then(elements => {
const option = elements[[elements.length - 1]].getAttribute('value');
cy.get('.umb-box-content > .ng-scope > .input-block-level')
cy.get('.umb-box-content > div > .input-block-level')
.select(option);
});
@@ -326,8 +331,8 @@ context('Content', () => {
cy.reload();
// Assert
cy.get('.history').find('.umb-badge').eq(0).should('contain.text', "Save");
cy.get('.history').find('.umb-badge').eq(1).should('contain.text', "Rollback");
cy.get('.history').find('.umb-badge').contains('Save').should('be.visible');
cy.get('.history').find('.umb-badge').contains('Rollback').should('be.visible');
cy.get('#headerName').should('have.value', initialNodeName);
// Clean up (content is automatically deleted when document types are gone)
@@ -343,9 +348,9 @@ context('Content', () => {
.withName(rootDocTypeName)
.withAllowAsRoot(true)
.addGroup()
.addTextBoxProperty()
.withLabel(labelName)
.done()
.addTextBoxProperty()
.withLabel(labelName)
.done()
.done()
.build();
@@ -356,8 +361,8 @@ context('Content', () => {
const rootContentNode = new ContentBuilder()
.withContentTypeAlias(generatedRootDocType["alias"])
.addVariant()
.withName(nodeName)
.withSave(true)
.withName(nodeName)
.withSave(true)
.done()
.build();
@@ -365,8 +370,7 @@ context('Content', () => {
});
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
refreshContentTree();
// Access node
cy.umbracoTreeItem("content", [nodeName]).click();
@@ -398,8 +402,8 @@ context('Content', () => {
.withContentTypeAlias(generatedRootDocType["alias"])
.withAction("saveNew")
.addVariant()
.withName(nodeName)
.withSave(true)
.withName(nodeName)
.withSave(true)
.done()
.build();
@@ -407,8 +411,7 @@ context('Content', () => {
});
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
refreshContentTree();
// Access node
cy.umbracoTreeItem("content", [nodeName]).click();
@@ -437,8 +440,8 @@ context('Content', () => {
.withContentTypeAlias(generatedRootDocType["alias"])
.withAction("saveNew")
.addVariant()
.withName(nodeName)
.withSave(true)
.withName(nodeName)
.withSave(true)
.done()
.build();
@@ -446,8 +449,7 @@ context('Content', () => {
});
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
refreshContentTree();
// Access node
cy.umbracoTreeItem("content", [nodeName]).click();
@@ -478,8 +480,8 @@ context('Content', () => {
const rootContentNode = new ContentBuilder()
.withContentTypeAlias(generatedRootDocType["alias"])
.addVariant()
.withName(nodeName)
.withSave(true)
.withName(nodeName)
.withSave(true)
.done()
.build();
@@ -487,8 +489,7 @@ context('Content', () => {
});
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
refreshContentTree();
// Access node
cy.umbracoTreeItem("content", [nodeName]).click();
@@ -499,4 +500,100 @@ context('Content', () => {
// Clean up (content is automatically deleted when document types are gone)
cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
});
it('Content with contentpicker', () => {
const pickerDocTypeName = 'Content picker doc type';
const pickerDocTypeAlias = AliasHelper.toAlias(pickerDocTypeName);
const pickedDocTypeName = 'Picked content document type';
cy.deleteAllContent();
cy.umbracoEnsureDocumentTypeNameNotExists(pickerDocTypeName);
cy.umbracoEnsureTemplateNameNotExists(pickerDocTypeName);
cy.umbracoEnsureDocumentTypeNameNotExists(pickedDocTypeName);
// Create the content type and content we'll be picking from.
const pickedDocType = new DocumentTypeBuilder()
.withName(pickedDocTypeName)
.withAllowAsRoot(true)
.addGroup()
.addTextBoxProperty()
.withAlias('text')
.done()
.done()
.build();
cy.saveDocumentType(pickedDocType).then((generatedType) => {
const pickedContentNode = new ContentBuilder()
.withContentTypeAlias(generatedType["alias"])
.withAction("publishNew")
.addVariant()
.withName('Content to pick')
.withSave(true)
.withPublish(true)
.addProperty()
.withAlias('text')
.withValue('Acceptance test')
.done()
.withSave(true)
.withPublish(true)
.done()
.build();
cy.saveContent(pickedContentNode);
});
// Create the doctype with a the picker
const pickerDocType = new DocumentTypeBuilder()
.withName(pickerDocTypeName)
.withAlias(pickerDocTypeAlias)
.withAllowAsRoot(true)
.withDefaultTemplate(pickerDocTypeAlias)
.addGroup()
.withName('ContentPickerGroup')
.addContentPickerProperty()
.withAlias('picker')
.done()
.done()
.build();
cy.saveDocumentType(pickerDocType);
// Edit it the template to allow us to verify the rendered view.
cy.editTemplate(pickerDocTypeName, `@inherits Umbraco.Web.Mvc.UmbracoViewPage<ContentModels.ContentPickerDocType>
@using ContentModels = Umbraco.Web.PublishedModels;
@{
Layout = null;
}
@{
IPublishedContent typedContentPicker = Model.Value<IPublishedContent>("picker");
if (typedContentPicker != null)
{
<p>@typedContentPicker.Value("text")</p>
}
}`);
// Create content with content picker
cy.get('.umb-tree-root-link').rightclick();
cy.get('.-opens-dialog > .umb-action-link').click();
cy.get('[data-element="action-create-' + pickerDocTypeAlias + '"] > .umb-action-link').click();
// Fill out content
cy.umbracoEditorHeaderName('ContentPickerContent');
cy.get('.umb-node-preview-add').click();
// Should really try and find a better way to do this, but umbracoTreeItem tries to click the content pane in the background
cy.get('[ng-if="vm.treeReady"] > .umb-tree > [ng-if="!tree.root.containsGroups"] > .umb-animated > .umb-tree-item__inner').click();
// We have to wait for the picked content to show up or it wont be added.
cy.get('.umb-node-preview__description').should('be.visible');
//save and publish
cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
cy.umbracoSuccessNotification().should('be.visible');
// Assert
cy.log('Checking that content is rendered correctly.')
const expectedContent = '<p>Acceptance test</p>'
cy.umbracoVerifyRenderedViewContent('contentpickercontent', expectedContent, true).should('be.true');
// clean
cy.umbracoEnsureDocumentTypeNameNotExists(pickerDocTypeName);
cy.umbracoEnsureTemplateNameNotExists(pickerDocTypeName);
cy.umbracoEnsureDocumentTypeNameNotExists(pickedDocTypeName);
});
});

7
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
View File

@@ -8,7 +8,8 @@ context('Members', () => {
it('Create member', () => {
const name = "Alice Bobson";
const email = "alice-bobson@acceptancetest.umbraco";
const password = "$AUlkoF*St0kgPiyyVEk5iU5JWdN*F7&@OSl5Y4pOofnidfifkBj5Ns2ONv%FzsTl36V1E924Gw97zcuSeT7UwK&qb5l&O9h!d!w";
const password = "$AUlkoF*St0kgPiyyVEk5iU5JWdN*F7&";
const passwordTimeout = 20000
cy.umbracoEnsureMemberEmailNotExists(email);
cy.umbracoSection('member');
@@ -24,8 +25,8 @@ context('Members', () => {
cy.get('input#_umb_login').clear().type(email);
cy.get('input#_umb_email').clear().type(email);
cy.get('input#password').clear().type(password);
cy.get('input#confirmPassword').clear().type(password);
cy.get('input#password').clear().type(password, { timeout: passwordTimeout });
cy.get('input#confirmPassword').clear().type(password, { timeout: passwordTimeout });
// Save
cy.get('.btn-success').click();

23
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
View File

@@ -18,25 +18,30 @@ context('Templates', () => {
cy.umbracoContextMenuAction("action-create").click();
}
it('Create template', () => {
const name = "Test template test";
const name = "Create template test";
cy.umbracoEnsureTemplateNameNotExists(name);
createTemplate();
//Type name
cy.umbracoEditorHeaderName(name);
/* Make an edit, if you don't the file will be create twice,
only happens in testing though, probably because the test is too fast
Certifiably mega wonk regardless */
cy.get('.ace_text-input').type("var num = 5;", {force:true} );
//Save
// 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
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
// and there wont be any duplicates or file in use errors.
cy.get('.btn-success').click();
//Assert
cy.umbracoSuccessNotification().should('be.visible');
// For some reason cy.umbracoErrorNotification tries to click the element which is not possible
// if it doesn't actually exist, making should('not.be.visible') impossible.
cy.get('.umb-notifications__notifications > .alert-error').should('not.be.visible');
//Clean up
cy.umbracoEnsureTemplateNameNotExists(name);

2
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
View File

@@ -71,7 +71,7 @@ function resetTourData() {
function runBackOfficeIntroTour(percentageComplete, buttonText, timeout) {
cy.get('[data-element="help-tours"]').should("be.visible");
cy.get('[data-element="help-tours"]').click();
cy.get('[data-element="help-tours"] .umb-progress-circle', { timeout: timeout }).get('[percentage]').contains(percentageComplete + '%');
cy.get('[data-element="help-tours"] .umb-progress-circle', { timeout: timeout }).get('[percentage]').contains(percentageComplete + '%', { timeout: timeout });
cy.get('[data-element="help-tours"]').click();
cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').should("be.visible");
cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').contains(buttonText);

2
src/Umbraco.Tests.AcceptanceTest/package.json
View File

@@ -9,7 +9,7 @@
"cross-env": "^7.0.2",
"cypress": "^5.1.0",
"ncp": "^2.0.0",
"umbraco-cypress-testhelpers": "^1.0.0-beta-50",
"umbraco-cypress-testhelpers": "^1.0.0-beta-51",
"prompt": "^1.0.0"
},
"dependencies": {