AcceptanceTests
'; - await umbracoApi.partialView.create(partialViewFileName, "@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n", "/"); + await umbracoApi.partialView.create(partialViewFileName, defaultPartialViewContent, '/'); expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeTruthy(); //Act @@ -110,18 +109,20 @@ test.describe('Partial View tests', () => { await umbracoUi.partialView.clickSaveButton(); // Assert + await umbracoUi.partialView.isSuccessNotificationVisible(); const updatedPartialView = await umbracoApi.partialView.getByName(partialViewFileName); expect(updatedPartialView.content).toBe(updatedPartialViewContent); }); - test('can use query builder with Order By statement for a partial view', async ({umbracoApi, umbracoUi}) => { + // Remove skip when the front-end is ready. Currently this function is not stable, sometimes the shown code is not updated after choosing Order By + test.skip('can use query builder with Order By statement for a partial view', async ({umbracoApi, umbracoUi}) => { //Arrange const propertyAliasValue = 'UpdateDate'; - const isAscending = false; + const isAscending = true; const expectedCode = 'Umbraco.ContentAtRoot().FirstOrDefault()\r\n' + ' .Children()\r\n' + ' .Where(x => x.IsVisible())\r\n' + - ' .OrderByDescending(x => x.' + propertyAliasValue + ')'; + ' .OrderBy(x => x.' + propertyAliasValue + ')'; const expectedTemplateContent = '\r\n' + '@{\r\n' + '\tvar selection = ' + expectedCode + ';\r\n' + @@ -134,16 +135,13 @@ test.describe('Partial View tests', () => { '\t\t\r\n' + '\t}\r\n' + '\r\n' + - '\r\n' + - '@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n'; + '\r\n' + defaultPartialViewContent; - await umbracoApi.partialView.create(partialViewFileName, "@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n", "/"); + await umbracoApi.partialView.create(partialViewFileName, defaultPartialViewContent, '/'); expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeTruthy(); // Act await umbracoUi.partialView.openPartialViewAtRoot(partialViewFileName); - // Wait for the partial view to open - await umbracoUi.waitForTimeout(1000); await umbracoUi.partialView.addQueryBuilderWithOrderByStatement(propertyAliasValue, isAscending); // Verify that the code is shown await umbracoUi.partialView.isQueryBuilderCodeShown(expectedCode); @@ -151,11 +149,12 @@ test.describe('Partial View tests', () => { await umbracoUi.partialView.clickSaveButton(); // Assert + await umbracoUi.partialView.isSuccessNotificationVisible(); const updatedPartialView = await umbracoApi.partialView.getByName(partialViewFileName); expect(updatedPartialView.content).toBe(expectedTemplateContent); }); - test.skip('can use query builder with Where statement for a partial view', async ({umbracoApi, umbracoUi}) => { + test('can use query builder with Where statement for a partial view', async ({umbracoApi, umbracoUi}) => { //Arrange const propertyAliasValue = 'Name'; const operatorValue = 'is'; @@ -176,16 +175,13 @@ test.describe('Partial View tests', () => { '\t\t\r\n' + '\t}\r\n' + '\r\n' + - '\r\n' + - '@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n'; + '\r\n' + defaultPartialViewContent; - await umbracoApi.partialView.create(partialViewFileName, "@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n", "/"); + await umbracoApi.partialView.create(partialViewFileName, defaultPartialViewContent, '/'); expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeTruthy(); // Act await umbracoUi.partialView.openPartialViewAtRoot(partialViewFileName); - // Wait for the partial view to open - await umbracoUi.waitForTimeout(1000); await umbracoUi.partialView.addQueryBuilderWithWhereStatement(propertyAliasValue, operatorValue, constrainValue); // Verify that the code is shown await umbracoUi.partialView.isQueryBuilderCodeShown(expectedCode); @@ -193,47 +189,95 @@ test.describe('Partial View tests', () => { await umbracoUi.partialView.clickSaveButton(); // Assert + await umbracoUi.partialView.isSuccessNotificationVisible(); const updatedPartialView = await umbracoApi.partialView.getByName(partialViewFileName); expect(updatedPartialView.content).toBe(expectedTemplateContent); }); - test('can insert dictionaryItem into a partial view', async ({umbracoApi, umbracoUi}) => { + test('can insert dictionary item into a partial view', async ({umbracoApi, umbracoUi}) => { // Arrange - await umbracoApi.partialView.create(partialViewFileName, "@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n", "/"); + await umbracoApi.partialView.create(partialViewFileName, defaultPartialViewContent, '/'); expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeTruthy(); await umbracoApi.dictionary.ensureNameNotExists(dictionaryName); await umbracoApi.dictionary.create(dictionaryName); - const partialViewContent = '@Umbraco.GetDictionaryValue("' + dictionaryName + '")@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n'; + const partialViewContent = '@Umbraco.GetDictionaryValue("' + dictionaryName + '")' + defaultPartialViewContent; // Act await umbracoUi.partialView.openPartialViewAtRoot(partialViewFileName); - // Wait for the partial view to open - await umbracoUi.waitForTimeout(1000); - await umbracoUi.partialView.insertDictionaryByName(dictionaryName); + await umbracoUi.partialView.insertDictionaryItem(dictionaryName); await umbracoUi.partialView.clickSaveButton(); // Assert + await umbracoUi.partialView.isSuccessNotificationVisible(); + const partialViewData = await umbracoApi.partialView.getByName(partialViewFileName); + expect(partialViewData.content).toBe(partialViewContent); + }); + + test('can insert value into a partial view', async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.partialView.create(partialViewFileName, defaultPartialViewContent, '/'); + expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeTruthy(); + const systemFieldValue = 'createDate'; + const partialViewContent = '@Model.Value("' + systemFieldValue + '")' + defaultPartialViewContent; + + // Act + await umbracoUi.partialView.openPartialViewAtRoot(partialViewFileName); + await umbracoUi.waitForTimeout(1000); + await umbracoUi.template.insertSystemFieldValue(systemFieldValue); + await umbracoUi.template.clickSaveButton(); + + // Assert + await umbracoUi.partialView.isSuccessNotificationVisible(); const partialViewData = await umbracoApi.partialView.getByName(partialViewFileName); expect(partialViewData.content).toBe(partialViewContent); }); test('can delete a partial view', async ({umbracoApi, umbracoUi}) => { //Arrange - await umbracoApi.partialView.create(partialViewFileName, "@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n", "/"); + await umbracoApi.partialView.create(partialViewFileName, partialViewFileName, '/'); expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeTruthy(); //Act await umbracoUi.partialView.clickRootFolderCaretButton(); await umbracoUi.partialView.clickActionsMenuForPartialView(partialViewFileName); - await umbracoUi.partialView.deletePartialView(); + await umbracoUi.partialView.clickDeleteAndConfirmButton(); // Assert await umbracoUi.partialView.isSuccessNotificationVisible(); expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeFalsy(); // Verify the partial view is NOT displayed under the Partial Views section await umbracoUi.partialView.clickRootFolderCaretButton(); - await expect(umbracoUi.partialView.checkItemNameUnderPartialViewTree(partialViewFileName)).not.toBeVisible(); + await umbracoUi.partialView.isPartialViewTreeItemVisibile(partialViewFileName, false); + }); + + // TODO: Remove skip when the front-end is ready. Currently the returned items count is not updated after choosing the root content. + test.skip('can show returned items in query builder ', async ({umbracoApi, umbracoUi}) => { + //Arrange + // Create content at root with a child + const documentTypeName = 'ParentDocumentType'; + const childDocumentTypeName = 'ChildDocumentType'; + const contentName = 'ContentName'; + const childContentName = 'ChildContentName'; + const childDocumentTypeId = await umbracoApi.documentType.createDefaultDocumentTypeWithAllowAsRoot(childDocumentTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithAllowedChildNode(documentTypeName, childDocumentTypeId); + const contentId = await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoApi.document.createDefaultDocumentWithParent(childContentName, childDocumentTypeId, contentId); + // Create partial view + await umbracoApi.partialView.create(partialViewFileName, partialViewFileName, '/'); + expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeTruthy(); + + //Act + await umbracoUi.partialView.openPartialViewAtRoot(partialViewFileName); + await umbracoUi.partialView.clickQueryBuilderButton(); + await umbracoUi.partialView.chooseRootContentInQueryBuilder('(' + contentName + ')'); + + // Assert + await umbracoUi.partialView.doesReturnedItemsHaveCount(1); + await umbracoUi.partialView.doesQueryResultHaveContentName(childContentName); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); }); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts index e71712af67..692750bb25 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts @@ -26,7 +26,7 @@ test.describe('Partial View Folder tests', () => { expect(await umbracoApi.partialView.doesFolderExist(folderName)).toBeTruthy(); // Verify the partial view folder is displayed under the Partial Views section await umbracoUi.partialView.clickRootFolderCaretButton(); - await expect(umbracoUi.partialView.checkItemNameUnderPartialViewTree(folderName)).toBeVisible(); + await umbracoUi.partialView.isPartialViewTreeItemVisibile(folderName); }); test('can delete a folder', async ({umbracoApi, umbracoUi}) => { @@ -44,7 +44,7 @@ test.describe('Partial View Folder tests', () => { expect(await umbracoApi.partialView.doesFolderExist(folderName)).toBeFalsy(); // Verify the partial view folder is NOT displayed under the Partial Views section await umbracoUi.partialView.clickRootFolderCaretButton(); - await expect(umbracoUi.partialView.checkItemNameUnderPartialViewTree(folderName)).not.toBeVisible(); + await umbracoUi.partialView.isPartialViewTreeItemVisibile(folderName, false); }); test('can place a partial view into folder', async ({umbracoApi, umbracoUi}) => { @@ -56,7 +56,7 @@ test.describe('Partial View Folder tests', () => { // Act await umbracoUi.partialView.clickRootFolderCaretButton(); await umbracoUi.partialView.clickActionsMenuForPartialView(folderName); - await umbracoUi.partialView.clickCreateThreeDotsButton(); + await umbracoUi.partialView.clickCreateButton(); await umbracoUi.partialView.clickNewEmptyPartialViewButton(); await umbracoUi.partialView.enterPartialViewName(partialViewName); await umbracoUi.partialView.clickSaveButton(); @@ -66,8 +66,49 @@ test.describe('Partial View Folder tests', () => { const childrenData = await umbracoApi.partialView.getChildren(folderPath); expect(childrenData[0].name).toEqual(partialViewFileName); // Verify the partial view is displayed in the folder under the Partial Views section - await expect(umbracoUi.partialView.checkItemNameUnderPartialViewTree(partialViewFileName)).not.toBeVisible(); + await umbracoUi.partialView.isPartialViewTreeItemVisibile(partialViewFileName, false); await umbracoUi.partialView.clickCaretButtonForName(folderName); - await expect(umbracoUi.partialView.checkItemNameUnderPartialViewTree(partialViewFileName)).toBeVisible(); + await umbracoUi.partialView.isPartialViewTreeItemVisibile(partialViewFileName); + }); + + test('can create a folder in a folder', async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.partialView.createFolder(folderName); + const childFolderName = 'childFolderName'; + + // Act + await umbracoUi.partialView.clickRootFolderCaretButton(); + await umbracoUi.partialView.clickActionsMenuForPartialView(folderName); + await umbracoUi.partialView.createFolder(childFolderName); + + // Assert + await umbracoUi.partialView.isSuccessNotificationVisible(); + expect(await umbracoApi.partialView.doesNameExist(childFolderName)).toBeTruthy(); + const partialViewChildren = await umbracoApi.partialView.getChildren('/' + folderName); + expect(partialViewChildren[0].path).toBe('/' + folderName + '/' + childFolderName); + await umbracoUi.partialView.clickCaretButtonForName(folderName); + await umbracoUi.partialView.isPartialViewTreeItemVisibile(childFolderName); + }); + + test('can create a folder in a folder in a folder', async ({umbracoApi, umbracoUi}) => { + // Arrange + const childFolderName = 'ChildFolderName'; + const childOfChildFolderName = 'ChildOfChildFolderName'; + await umbracoApi.partialView.createFolder(folderName); + await umbracoApi.partialView.createFolder(childFolderName, folderName); + + // Act + await umbracoUi.partialView.clickRootFolderCaretButton(); + await umbracoUi.partialView.clickCaretButtonForName(folderName); + await umbracoUi.partialView.clickActionsMenuForPartialView(childFolderName); + await umbracoUi.partialView.createFolder(childOfChildFolderName); + + // Assert + await umbracoUi.partialView.isSuccessNotificationVisible(); + expect(await umbracoApi.partialView.doesNameExist(childOfChildFolderName)).toBeTruthy(); + const partialViewChildren = await umbracoApi.partialView.getChildren('/' + folderName + '/' + childFolderName); + expect(partialViewChildren[0].path).toBe('/' + folderName + '/' + childFolderName + '/' + childOfChildFolderName); + await umbracoUi.partialView.clickCaretButtonForName(childFolderName); + await umbracoUi.partialView.isPartialViewTreeItemVisibile(childOfChildFolderName); }); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts index b00f5ef4aa..74aafd1172 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts @@ -18,18 +18,16 @@ test.describe('Script tests', () => { test('can create a empty script', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.script.clickActionsMenuAtRoot(); - await umbracoUi.script.clickCreateThreeDotsButton(); + await umbracoUi.script.clickCreateButton(); await umbracoUi.script.clickNewJavascriptFileButton(); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.enterScriptName(scriptName); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.clickSaveButton(); // Assert await umbracoUi.script.isSuccessNotificationVisible(); expect(await umbracoApi.script.doesNameExist(scriptName)).toBeTruthy(); + await umbracoUi.script.clickRootFolderCaretButton(); + await umbracoUi.script.isScriptTreeItemVisibile(scriptName); }); test('can create a script with content', async ({umbracoApi, umbracoUi}) => { @@ -38,14 +36,10 @@ test.describe('Script tests', () => { // Act await umbracoUi.script.clickActionsMenuAtRoot(); - await umbracoUi.script.clickCreateThreeDotsButton(); + await umbracoUi.script.clickCreateButton(); await umbracoUi.script.clickNewJavascriptFileButton(); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.enterScriptName(scriptName); await umbracoUi.script.enterScriptContent(scriptContent); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.clickSaveButton(); // Assert @@ -53,6 +47,8 @@ test.describe('Script tests', () => { expect(await umbracoApi.script.doesNameExist(scriptName)).toBeTruthy(); const scriptData = await umbracoApi.script.getByName(scriptName); expect(scriptData.content).toBe(scriptContent); + await umbracoUi.script.clickRootFolderCaretButton(); + await umbracoUi.script.isScriptTreeItemVisibile(scriptName); }); test('can update a script', async ({umbracoApi, umbracoUi}) => { @@ -62,16 +58,11 @@ test.describe('Script tests', () => { // Act await umbracoUi.script.openScriptAtRoot(scriptName); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.enterScriptContent(updatedScriptContent); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.clickSaveButton(); // Assert - // TODO: Uncomment when the notification is visible. Currently there is no notification after you update a script - // await umbracoUi.script.isSuccessNotificationVisible(); + await umbracoUi.script.isSuccessNotificationVisible(); const updatedScript = await umbracoApi.script.get(scriptPath); expect(updatedScript.content).toBe(updatedScriptContent); }); @@ -83,10 +74,27 @@ test.describe('Script tests', () => { // Act await umbracoUi.script.clickRootFolderCaretButton(); await umbracoUi.script.clickActionsMenuForScript(scriptName); - await umbracoUi.script.deleteScript(); + await umbracoUi.script.clickDeleteAndConfirmButton(); // Assert await umbracoUi.script.isSuccessNotificationVisible(); expect(await umbracoApi.script.doesNameExist(scriptName)).toBeFalsy(); + await umbracoUi.script.isScriptTreeItemVisibile(scriptName, false); + }); + + test('can rename a script', async ({umbracoApi, umbracoUi}) => { + // Arrange + const wrongScriptName = 'WrongTestScript.js'; + await umbracoApi.script.create(wrongScriptName, ''); + + // Act + await umbracoUi.script.clickRootFolderCaretButton(); + await umbracoUi.script.clickActionsMenuForScript(wrongScriptName); + await umbracoUi.script.rename(scriptName); + + // Assert + await umbracoUi.script.isSuccessNotificationVisible(); + expect(await umbracoApi.script.doesNameExist(scriptName)).toBeTruthy(); + expect(await umbracoApi.script.doesNameExist(wrongScriptName)).toBeFalsy(); }); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts index 6935d7ddfc..e4d4eb6e15 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts @@ -23,6 +23,8 @@ test.describe('Script tests', () => { // Assert await umbracoUi.script.isSuccessNotificationVisible(); expect(await umbracoApi.script.doesFolderExist(scriptFolderName)).toBeTruthy(); + await umbracoUi.script.clickRootFolderCaretButton(); + await umbracoUi.script.isScriptTreeItemVisibile(scriptFolderName); }); test('can delete a folder', async ({umbracoApi, umbracoUi}) => { @@ -37,6 +39,7 @@ test.describe('Script tests', () => { // Assert await umbracoUi.script.isSuccessNotificationVisible(); expect(await umbracoApi.script.doesFolderExist(scriptFolderName)).toBeFalsy(); + await umbracoUi.script.isScriptTreeItemVisibile(scriptFolderName, false); }); test('can create a script in a folder', async ({umbracoApi, umbracoUi}) => { @@ -47,24 +50,21 @@ test.describe('Script tests', () => { // Act await umbracoUi.script.clickRootFolderCaretButton(); await umbracoUi.script.clickActionsMenuForScript(scriptFolderName); - await umbracoUi.script.clickCreateThreeDotsButton(); + await umbracoUi.script.clickCreateButton(); await umbracoUi.script.clickNewJavascriptFileButton(); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.enterScriptName(scriptName); await umbracoUi.script.enterScriptContent(scriptContent); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.clickSaveButton(); // Assert await umbracoUi.script.isSuccessNotificationVisible(); - // TODO: Check if the script was created correctly in the UI when the refresh button is implemented expect(await umbracoApi.script.doesNameExist(scriptName)).toBeTruthy(); const scriptChildren = await umbracoApi.script.getChildren('/' + scriptFolderName); expect(scriptChildren[0].path).toBe('/' + scriptFolderName + '/' + scriptName); const scriptData = await umbracoApi.script.get(scriptChildren[0].path); expect(scriptData.content).toBe(scriptContent); + await umbracoUi.stylesheet.clickCaretButtonForName(scriptFolderName); + await umbracoUi.script.isScriptTreeItemVisibile(scriptName); }); test('can create a folder in a folder', async ({umbracoApi, umbracoUi}) => { @@ -79,10 +79,11 @@ test.describe('Script tests', () => { // Assert await umbracoUi.script.isSuccessNotificationVisible(); - // TODO: Check if the folder was created correctly in the UI when the refresh button is implemented expect(await umbracoApi.script.doesNameExist(childFolderName)).toBeTruthy(); const scriptChildren = await umbracoApi.script.getChildren('/' + scriptFolderName); expect(scriptChildren[0].path).toBe('/' + scriptFolderName + '/' + childFolderName); + await umbracoUi.stylesheet.clickCaretButtonForName(scriptFolderName); + await umbracoUi.script.isScriptTreeItemVisibile(childFolderName); }); test('can create a folder in a folder in a folder', async ({umbracoApi, umbracoUi}) => { @@ -100,10 +101,11 @@ test.describe('Script tests', () => { // Assert await umbracoUi.script.isSuccessNotificationVisible(); - // TODO: Check if the folder was created correctly in the UI when the refresh button is implemented expect(await umbracoApi.script.doesNameExist(childOfChildFolderName)).toBeTruthy(); const scriptChildren = await umbracoApi.script.getChildren('/' + scriptFolderName + '/' + childFolderName); expect(scriptChildren[0].path).toBe('/' + scriptFolderName + '/' + childFolderName + '/' + childOfChildFolderName); + await umbracoUi.stylesheet.clickCaretButtonForName(childFolderName); + await umbracoUi.script.isScriptTreeItemVisibile(childOfChildFolderName); }); test('can create a script in a folder in a folder', async ({umbracoApi, umbracoUi}) => { @@ -116,21 +118,17 @@ test.describe('Script tests', () => { await umbracoUi.script.clickRootFolderCaretButton(); await umbracoUi.script.clickCaretButtonForName(scriptFolderName); await umbracoUi.script.clickActionsMenuForScript(childFolderName); - await umbracoUi.script.clickCreateThreeDotsButton(); + await umbracoUi.script.clickCreateButton(); await umbracoUi.script.clickNewJavascriptFileButton(); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.enterScriptName(scriptName); - await umbracoUi.script.enterScriptName(scriptName); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.script.clickSaveButton(); // Assert await umbracoUi.script.isSuccessNotificationVisible(); - // TODO: Check if the script was created correctly in the UI when the refresh button is implemented expect(await umbracoApi.script.doesNameExist(scriptName)).toBeTruthy(); const scriptChildren = await umbracoApi.script.getChildren('/' + scriptFolderName + '/' + childFolderName); expect(scriptChildren[0].path).toBe('/' + scriptFolderName + '/' + childFolderName + '/' + scriptName); + await umbracoUi.stylesheet.clickCaretButtonForName(childFolderName); + await umbracoUi.script.isScriptTreeItemVisibile(scriptName); }); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/Stylesheet.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/Stylesheet.spec.ts index 9f0c22a752..2da417a255 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/Stylesheet.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/Stylesheet.spec.ts @@ -3,7 +3,9 @@ import {expect} from '@playwright/test'; test.describe('Stylesheets tests', () => { const stylesheetName = 'TestStyleSheetFile.css'; - const ruleName = 'TestRuleName'; + const styleName = 'TestStyleName'; + const styleSelector = 'h1'; + const styleStyles = 'color:red'; test.beforeEach(async ({umbracoUi,umbracoApi}) => { await umbracoUi.goToBackOffice(); @@ -18,19 +20,16 @@ test.describe('Stylesheets tests', () => { test('can create a empty stylesheet', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.stylesheet.clickActionsMenuAtRoot(); - await umbracoUi.stylesheet.clickCreateThreeDotsButton(); + await umbracoUi.stylesheet.clickCreateButton(); await umbracoUi.stylesheet.clickNewStylesheetButton(); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.stylesheet.enterStylesheetName(stylesheetName); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.stylesheet.clickSaveButton(); // Assert await umbracoUi.stylesheet.isSuccessNotificationVisible(); expect(await umbracoApi.stylesheet.doesNameExist(stylesheetName)).toBeTruthy(); - // TODO: when frontend is ready, verify the new stylesheet is displayed under the Stylesheets section + await umbracoUi.stylesheet.clickRootFolderCaretButton(); + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(stylesheetName); }); test('can create a stylesheet with content', async ({umbracoApi, umbracoUi}) => { @@ -39,61 +38,57 @@ test.describe('Stylesheets tests', () => { //Act await umbracoUi.stylesheet.clickActionsMenuAtRoot(); - await umbracoUi.stylesheet.clickCreateThreeDotsButton(); + await umbracoUi.stylesheet.clickCreateButton(); await umbracoUi.stylesheet.clickNewStylesheetButton(); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.stylesheet.enterStylesheetName(stylesheetName); await umbracoUi.stylesheet.enterStylesheetContent(stylesheetContent); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.stylesheet.clickSaveButton(); // Assert await umbracoUi.stylesheet.isSuccessNotificationVisible(); expect(await umbracoApi.stylesheet.doesNameExist(stylesheetName)).toBeTruthy(); - // TODO: when frontend is ready, verify the new stylesheet is displayed under the Stylesheets section const stylesheetData = await umbracoApi.stylesheet.getByName(stylesheetName); expect(stylesheetData.content).toEqual(stylesheetContent); + await umbracoUi.stylesheet.clickRootFolderCaretButton(); + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(stylesheetName); }); - // We are not able to create stylesheet with RTE styles. - test.skip('can create a new Rich Text Editor stylesheet file', async ({umbracoApi, umbracoUi}) => { + test('can create a new Rich Text Editor stylesheet file', async ({umbracoApi, umbracoUi}) => { + // Arrange + const stylesheetContent = '/**umb_name:' + styleName + '*/\n' + styleSelector + ' {\n\t' + styleStyles + '\n}'; + //Act await umbracoUi.stylesheet.clickActionsMenuAtRoot(); - await umbracoUi.stylesheet.clickCreateThreeDotsButton(); + await umbracoUi.stylesheet.clickCreateButton(); await umbracoUi.stylesheet.clickNewRichTextEditorStylesheetButton(); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.stylesheet.enterStylesheetName(stylesheetName); - await umbracoUi.stylesheet.addNewRule(ruleName, 'h1', 'color:red'); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); + await umbracoUi.stylesheet.addRTEStyle(styleName, styleSelector, styleStyles); await umbracoUi.stylesheet.clickSaveButton(); // Assert await umbracoUi.stylesheet.isSuccessNotificationVisible(); expect(await umbracoApi.stylesheet.doesExist(stylesheetName)).toBeTruthy(); - expect(await umbracoApi.stylesheet.doesRuleNameExist(stylesheetName, ruleName)).toBeTruthy(); - // TODO: when frontend is ready, verify the new stylesheet is displayed under the Stylesheets section + const stylesheetData = await umbracoApi.stylesheet.getByName(stylesheetName); + expect(stylesheetData.content).toEqual(stylesheetContent); + await umbracoUi.stylesheet.clickRootFolderCaretButton(); + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(stylesheetName); }); - // We are not able to update a stylesheet with RTE styles. - test.skip('can update a stylesheet', async ({umbracoApi, umbracoUi}) => { + test('can update a stylesheet', async ({umbracoApi, umbracoUi}) => { // Arrange + const stylesheetContent = '/**umb_name:' + styleName + '*/\n' + styleSelector + ' {\n\t' + styleStyles + '\n}'; await umbracoApi.stylesheet.create(stylesheetName, '', '/'); + expect(await umbracoApi.stylesheet.doesExist(stylesheetName)).toBeTruthy(); //Act await umbracoUi.stylesheet.openStylesheetByNameAtRoot(stylesheetName); - await umbracoUi.stylesheet.addNewRule(ruleName, 'h1', 'color:red'); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); + await umbracoUi.stylesheet.addRTEStyle(styleName, styleSelector, styleStyles); await umbracoUi.stylesheet.clickSaveButton(); // Assert - // await umbracoUi.stylesheet.isSuccessNotificationVisible(); - expect(await umbracoApi.stylesheet.doesRuleNameExist(stylesheetName, ruleName)).toBeTruthy(); - // TODO: when frontend is ready, verify the notification displays + await umbracoUi.stylesheet.isSuccessNotificationVisible(); + const stylesheetData = await umbracoApi.stylesheet.getByName(stylesheetName); + expect(stylesheetData.content).toEqual(stylesheetContent); }); test('can delete a stylesheet', async ({umbracoApi, umbracoUi}) => { @@ -103,12 +98,65 @@ test.describe('Stylesheets tests', () => { //Act await umbracoUi.stylesheet.clickRootFolderCaretButton(); await umbracoUi.stylesheet.clickActionsMenuForStylesheet(stylesheetName); - await umbracoUi.stylesheet.deleteStylesheet(); + await umbracoUi.stylesheet.clickDeleteAndConfirmButton(); // Assert await umbracoUi.stylesheet.isSuccessNotificationVisible(); expect(await umbracoApi.stylesheet.doesNameExist(stylesheetName)).toBeFalsy(); - // TODO: when frontend is ready, verify the new stylesheet is NOT displayed under the Stylesheets section - // TODO: when frontend is ready, verify the notification displays + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(stylesheetName, false); + }); + + test('can rename a stylesheet', async ({umbracoApi, umbracoUi}) => { + // Arrange + const wrongStylesheetName = 'WrongStylesheetName.css'; + await umbracoApi.stylesheet.create(wrongStylesheetName, '', '/'); + + //Act + await umbracoUi.stylesheet.clickRootFolderCaretButton(); + await umbracoUi.stylesheet.clickActionsMenuForStylesheet(wrongStylesheetName); + await umbracoUi.stylesheet.rename(stylesheetName); + + // Assert + await umbracoUi.stylesheet.isSuccessNotificationVisible(); + expect(await umbracoApi.stylesheet.doesNameExist(stylesheetName)).toBeTruthy(); + expect(await umbracoApi.stylesheet.doesNameExist(wrongStylesheetName)).toBeFalsy(); + }); + + test('can edit rich text editor styles', async ({umbracoApi, umbracoUi}) => { + // Arrange + const newStyleName = 'TestNewStyleName'; + const newStyleSelector = 'h2'; + const newStyleStyles = 'color: white'; + const newStylesheetContent = '/**umb_name:' + newStyleName + '*/\n' + newStyleSelector + ' {\n\t' + newStyleStyles + '\n}'; + const stylesheetContent = '/**umb_name:' + styleName + '*/\n' + styleSelector + ' {\n\t' + styleStyles + '\n}'; + await umbracoApi.stylesheet.create(stylesheetName, stylesheetContent, '/'); + expect(await umbracoApi.stylesheet.doesExist(stylesheetName)).toBeTruthy(); + + //Act + await umbracoUi.stylesheet.openStylesheetByNameAtRoot(stylesheetName); + await umbracoUi.stylesheet.editRTEStyle(styleName, newStyleName, newStyleSelector, newStyleStyles); + await umbracoUi.stylesheet.clickSaveButton(); + + // Assert + await umbracoUi.stylesheet.isSuccessNotificationVisible(); + const stylesheetData = await umbracoApi.stylesheet.getByName(stylesheetName); + expect(stylesheetData.content).toEqual(newStylesheetContent); + }); + + test('can remove rich text editor styles', async ({umbracoApi, umbracoUi}) => { + // Arrange + const stylesheetContent = '/**umb_name:' + styleName + '*/\n' + styleSelector + ' {\n\t' + styleStyles + '\n}'; + await umbracoApi.stylesheet.create(stylesheetName, stylesheetContent, '/'); + expect(await umbracoApi.stylesheet.doesExist(stylesheetName)).toBeTruthy(); + + //Act + await umbracoUi.stylesheet.openStylesheetByNameAtRoot(stylesheetName); + await umbracoUi.stylesheet.removeRTEStyle(styleName); + await umbracoUi.stylesheet.clickSaveButton(); + + // Assert + await umbracoUi.stylesheet.isSuccessNotificationVisible(); + const stylesheetData = await umbracoApi.stylesheet.getByName(stylesheetName); + expect(stylesheetData.content).toEqual(''); }); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts index 096ea0d66c..0e0ba8746e 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts @@ -23,7 +23,8 @@ test.describe('Stylesheets tests', () => { // Assert await umbracoUi.stylesheet.isSuccessNotificationVisible(); expect(await umbracoApi.stylesheet.doesFolderExist(stylesheetFolderName)).toBeTruthy(); - // TODO: when frontend is ready, verify the new folder is displayed under the Stylesheets section + await umbracoUi.stylesheet.clickRootFolderCaretButton(); + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(stylesheetFolderName); }); test('can delete a folder', async ({umbracoApi, umbracoUi}) => { @@ -38,7 +39,7 @@ test.describe('Stylesheets tests', () => { // Assert await umbracoUi.stylesheet.isSuccessNotificationVisible(); expect(await umbracoApi.stylesheet.doesFolderExist(stylesheetFolderName)).toBeFalsy(); - // TODO: when frontend is ready, verify the removed folder is NOT displayed under the Stylesheets section + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(stylesheetFolderName, false); }); test('can create a folder in a folder', async ({umbracoApi, umbracoUi}) => { @@ -56,7 +57,8 @@ test.describe('Stylesheets tests', () => { expect(await umbracoApi.stylesheet.doesNameExist(childFolderName)).toBeTruthy(); const styleChildren = await umbracoApi.stylesheet.getChildren('/' + stylesheetFolderName); expect(styleChildren[0].path).toBe('/' + stylesheetFolderName + '/' + childFolderName); - // TODO: when frontend is ready, verify the new folder is displayed under the Stylesheets section + await umbracoUi.stylesheet.clickCaretButtonForName(stylesheetFolderName); + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(childFolderName); }); test('can create a folder in a folder in a folder', async ({umbracoApi, umbracoUi}) => { @@ -77,7 +79,8 @@ test.describe('Stylesheets tests', () => { expect(await umbracoApi.stylesheet.doesNameExist(childOfChildFolderName)).toBeTruthy(); const styleChildren = await umbracoApi.stylesheet.getChildren('/' + stylesheetFolderName + '/' + childFolderName); expect(styleChildren[0].path).toBe('/' + stylesheetFolderName + '/' + childFolderName + '/' + childOfChildFolderName); - // TODO: when frontend is ready, verify the new folder is displayed under the Stylesheets section + await umbracoUi.stylesheet.clickCaretButtonForName(childFolderName); + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(childOfChildFolderName); }); test('can create a stylesheet in a folder', async ({umbracoApi, umbracoUi}) => { @@ -88,25 +91,21 @@ test.describe('Stylesheets tests', () => { //Act await umbracoUi.stylesheet.clickRootFolderCaretButton(); await umbracoUi.stylesheet.clickActionsMenuForStylesheet(stylesheetFolderName); - await umbracoUi.stylesheet.clickCreateThreeDotsButton(); + await umbracoUi.stylesheet.clickCreateButton(); await umbracoUi.stylesheet.clickNewStylesheetButton(); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.stylesheet.enterStylesheetName(stylesheetName); await umbracoUi.stylesheet.enterStylesheetContent(stylesheetContent); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.stylesheet.clickSaveButton(); // Assert await umbracoUi.stylesheet.isSuccessNotificationVisible(); expect(await umbracoApi.stylesheet.doesNameExist(stylesheetName)).toBeTruthy(); - // TODO: when frontend is ready, verify the new stylesheet is displayed under the Stylesheets section - expect(await umbracoApi.stylesheet.doesNameExist(stylesheetName)).toBeTruthy(); const stylesheetChildren = await umbracoApi.stylesheet.getChildren('/' + stylesheetFolderName); expect(stylesheetChildren[0].path).toBe('/' + stylesheetFolderName + '/' + stylesheetName); const stylesheetData = await umbracoApi.stylesheet.get(stylesheetChildren[0].path); expect(stylesheetData.content).toBe(stylesheetContent); + await umbracoUi.stylesheet.clickCaretButtonForName(stylesheetFolderName); + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(stylesheetName); }); test('can create a stylesheet in a folder in a folder', async ({umbracoApi, umbracoUi}) => { @@ -120,24 +119,20 @@ test.describe('Stylesheets tests', () => { await umbracoUi.stylesheet.clickRootFolderCaretButton(); await umbracoUi.stylesheet.clickCaretButtonForName(stylesheetFolderName); await umbracoUi.stylesheet.clickActionsMenuForStylesheet(childFolderName); - await umbracoUi.stylesheet.clickCreateThreeDotsButton(); + await umbracoUi.stylesheet.clickCreateButton(); await umbracoUi.stylesheet.clickNewStylesheetButton(); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.stylesheet.enterStylesheetName(stylesheetName); await umbracoUi.stylesheet.enterStylesheetContent(stylesheetContent); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(500); await umbracoUi.stylesheet.clickSaveButton(); // Assert await umbracoUi.stylesheet.isSuccessNotificationVisible(); expect(await umbracoApi.stylesheet.doesNameExist(stylesheetName)).toBeTruthy(); - // TODO: when frontend is ready, verify the new stylesheet is displayed under the Stylesheets section - expect(await umbracoApi.stylesheet.doesNameExist(stylesheetName)).toBeTruthy(); const stylesheetChildren = await umbracoApi.stylesheet.getChildren('/' + stylesheetFolderName + '/' + childFolderName); expect(stylesheetChildren[0].path).toBe('/' + stylesheetFolderName + '/' + childFolderName + '/' + stylesheetName); const stylesheetData = await umbracoApi.stylesheet.get(stylesheetChildren[0].path); expect(stylesheetData.content).toBe(stylesheetContent); + await umbracoUi.stylesheet.clickCaretButtonForName(childFolderName); + await umbracoUi.stylesheet.isStylesheetTreeItemVisibile(stylesheetName); }); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts index b0d767d4f7..ee66b900b7 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts @@ -3,6 +3,7 @@ import {expect} from "@playwright/test"; test.describe('Template tests', () => { const templateName = 'TestTemplate'; + const defaultTemplateContent = '@using Umbraco.Cms.Web.Common.PublishedModels;\r\n@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n@{\r\n\tLayout = null;\r\n}'; test.beforeEach(async ({umbracoUi, umbracoApi}) => { await umbracoApi.template.ensureNameNotExists(templateName); @@ -14,31 +15,26 @@ test.describe('Template tests', () => { await umbracoApi.template.ensureNameNotExists(templateName); }); - test.skip('can create a template', async ({umbracoApi, umbracoUi}) => { + test('can create a template', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.template.clickActionsMenuAtRoot(); - await umbracoUi.template.clickNewTemplateButton(); + await umbracoUi.template.clickCreateButton(); await umbracoUi.template.enterTemplateName(templateName); - // TODO: Remove this timeout when frontend validation is implemented - await umbracoUi.waitForTimeout(1000); await umbracoUi.template.clickSaveButton(); // Assert await umbracoUi.template.isSuccessNotificationVisible(); expect(await umbracoApi.template.doesNameExist(templateName)).toBeTruthy(); + await umbracoUi.template.clickRootFolderCaretButton(); + await umbracoUi.template.isTemplateTreeItemVisibile(templateName); }); - test('can update a template', async ({umbracoApi, umbracoUi}) => { + test('can update content of a template', async ({umbracoApi, umbracoUi}) => { // Arrange - const templateAlias = AliasHelper.toAlias(templateName); - const updatedTemplateContent = '@using Umbraco.Cms.Web.Common.PublishedModels;\r\n' + - '@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n' + - '@{\r\n' + - '\tLayout = null;\r\n' + - '}\r\n' + - 'AcceptanceTests
'; + const updatedTemplateContent = + defaultTemplateContent + '\r\n' + 'AcceptanceTests
'; - await umbracoApi.template.create(templateName, templateAlias, ''); + await umbracoApi.template.createDefaultTemplate(templateName); // Act await umbracoUi.template.goToTemplate(templateName); @@ -52,59 +48,122 @@ test.describe('Template tests', () => { expect(updatedTemplate.content).toBe(updatedTemplateContent); }); - test('can delete a template', async ({umbracoApi, umbracoUi}) => { + test('can rename a template', async ({umbracoApi, umbracoUi}) => { // Arrange - const templateAlias = AliasHelper.toAlias(templateName); - await umbracoApi.template.create(templateName, templateAlias, ''); + const wrongTemplateName = 'WrongTemplateName'; + const templateAlias = AliasHelper.toAlias(wrongTemplateName); + await umbracoApi.template.ensureNameNotExists(wrongTemplateName); + const templateId = await umbracoApi.template.create(wrongTemplateName, templateAlias, ''); + expect(await umbracoApi.template.doesNameExist(wrongTemplateName)).toBeTruthy(); // Act - await umbracoUi.template.clickRootFolderCaretButton(); - await umbracoUi.template.clickActionsMenuForTemplate(templateName); - await umbracoUi.template.deleteTemplate(); - - // Assert - await umbracoUi.template.isSuccessNotificationVisible(); - expect(await umbracoApi.template.doesNameExist(templateName)).toBeFalsy(); - }); - - test.skip('can set a template as master template', async ({umbracoApi, umbracoUi}) => { - // Arrange - const templateAlias = AliasHelper.toAlias(templateName); - const childTemplateName = 'ChildTemplate'; - const childTemplateAlias = AliasHelper.toAlias(childTemplateName); - await umbracoApi.template.ensureNameNotExists(childTemplateName); - await umbracoApi.template.create(templateName, templateAlias, ''); - await umbracoApi.template.create(childTemplateName, childTemplateAlias, ''); - - // Act - await umbracoUi.template.goToTemplate(childTemplateName); - await umbracoUi.template.clickChangeMasterTemplateButton(); - await umbracoUi.template.clickCaretDictionaryButton(); - await umbracoUi.template.clickButtonWithName(templateName); - await umbracoUi.template.clickSubmitButton(); + await umbracoUi.template.goToTemplate(wrongTemplateName); + await umbracoUi.template.enterTemplateName(templateName); await umbracoUi.template.clickSaveButton(); // Assert await umbracoUi.template.isSuccessNotificationVisible(); - expect(await umbracoUi.template.isMasterTemplateNameVisible(templateName)).toBeTruthy(); + const templateData = await umbracoApi.template.get(templateId); + expect(templateData.name).toBe(templateName); + }); + + test('can delete a template', async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.template.createDefaultTemplate(templateName); + + // Act + await umbracoUi.template.clickRootFolderCaretButton(); + await umbracoUi.template.clickActionsMenuForTemplate(templateName); + await umbracoUi.template.clickDeleteAndConfirmButton(); + + // Assert + await umbracoUi.template.isSuccessNotificationVisible(); + expect(await umbracoApi.template.doesNameExist(templateName)).toBeFalsy(); + await umbracoUi.template.isTemplateTreeItemVisibile(templateName, false); + }); + + test('can set a template as master template', async ({umbracoApi, umbracoUi}) => { + // Arrange + const childTemplateName = 'ChildTemplate'; + await umbracoApi.template.ensureNameNotExists(childTemplateName); + await umbracoApi.template.createDefaultTemplate(templateName); + await umbracoApi.template.createDefaultTemplate(childTemplateName); + + // Act + await umbracoUi.template.goToTemplate(childTemplateName); + await umbracoUi.template.clickChangeMasterTemplateButton(); + await umbracoUi.template.clickButtonWithName(templateName); + await umbracoUi.template.clickChooseButton(); + await umbracoUi.template.clickSaveButton(); + + // Assert + await umbracoUi.template.isSuccessNotificationVisible(); + await umbracoUi.template.isMasterTemplateNameVisible(templateName); // Checks if the childTemplate has the masterTemplate set - const childTemplate = await umbracoApi.template.getByName(childTemplateName); - const masterTemplate = await umbracoApi.template.getByName(templateName); - expect(childTemplate.masterTemplateId).toBe(masterTemplate.id); + const childTemplateData = await umbracoApi.template.getByName(childTemplateName); + const masterTemplateData = await umbracoApi.template.getByName(templateName); + expect(childTemplateData.masterTemplate.id).toBe(masterTemplateData.id); // Clean await umbracoApi.template.ensureNameNotExists(childTemplateName); }); - test.skip('can use query builder for a template', async ({umbracoApi, umbracoUi}) => { + test('can remove a master template', async ({umbracoApi, umbracoUi}) => { // Arrange + const childTemplateName = 'ChildTemplate'; const templateAlias = AliasHelper.toAlias(templateName); + const childTemplateAlias = AliasHelper.toAlias(childTemplateName); + const childTemplateContent = '@{\n\tLayout = \"' + templateAlias + '.cshtml\";\n}\n'; + await umbracoApi.template.ensureNameNotExists(childTemplateName); await umbracoApi.template.create(templateName, templateAlias, ''); - const expectedTemplateContent = '\r\n@{\r\n\tvar selection = Umbraco.ContentAtRoot().FirstOrDefault()\r\n .Children()\r\n .Where(x =\u003E x.IsVisible())\r\n .OrderBy(x =\u003E x.CreateDate);\r\n}\r\n\u003Cul\u003E\r\n\t@foreach (var item in selection)\r\n\t{\r\n\t\t\u003Cli\u003E\r\n\t\t\t\u003Ca href=\u0022@item.Url()\u0022\u003E@item.Name()\u003C/a\u003E\r\n\t\t\u003C/li\u003E\r\n\t}\r\n\u003C/ul\u003E\r\n\r\n@using Umbraco.Cms.Web.Common.PublishedModels;\r\n@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n@{\r\n\tLayout = null;\r\n}'; + await umbracoApi.template.create(childTemplateName, childTemplateAlias, childTemplateContent); + + // Act + await umbracoUi.template.goToTemplate(templateName, childTemplateName); + await umbracoUi.template.clickRemoveMasterTemplateButton(); + await umbracoUi.template.clickSaveButton(); + + // Assert + await umbracoUi.template.isSuccessNotificationVisible(); + await umbracoUi.template.isMasterTemplateNameVisible('No master'); + const childTemplate = await umbracoApi.template.getByName(childTemplateName); + expect(childTemplate.masterTemplate).toBe(null); + + // Clean + await umbracoApi.template.ensureNameNotExists(childTemplateName); + }); + + // Remove skip when the front-end is ready. Currently this function is not stable, sometimes the shown code is not updated after choosing Order By + test.skip('can use query builder with Order By statement for a template', async ({umbracoApi, umbracoUi}) => { + // Arrange + const propertyAliasValue = 'UpdateDate'; + const isAscending = true; + const expectedCode = 'Umbraco.ContentAtRoot().FirstOrDefault()\r\n' + + ' .Children()\r\n' + + ' .Where(x => x.IsVisible())\r\n' + + ' .OrderBy(x => x.' + propertyAliasValue + ')'; + const expectedTemplateContent = '\r\n' + + '@{\r\n' + + '\tvar selection = ' + expectedCode + ';\r\n' + + '}\r\n' + + '