V14 Added acceptance tests for Data Type - p2

tests/Umbraco.Tests.AcceptanceTest/package.json

@@ -8,7 +8,7 @@
     "test": "npx playwright test DefaultConfig",
     "all": "npx playwright test",
     "createTest": "node createTest.js",
-    "smokeTest": "npx playwright test DefaultConfig --grep \"@smoke\""
+    "smokeTest": "npx playwright test DataType"
   },
   "devDependencies": {
     "@playwright/test": "^1.43",

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ApprovedColor.spec.ts

@@ -3,9 +3,9 @@ import {expect} from "@playwright/test";
 
 const dataTypeName = 'Approved Color';
 let dataTypeDefaultData = null;
-let dataTypeData = null;
-const colorValue = '#ffffff';
-const colorLabel = 'TestColor';
+let dataTypeData = null;  
+const colorValue = 'ffffff';
+const colorLabel = '';
 
 test.beforeEach(async ({umbracoUi, umbracoApi}) => {
   await umbracoUi.goToBackOffice();
@@ -42,8 +42,7 @@ test('can include label', async ({umbracoApi, umbracoUi}) => {
   expect(dataTypeData.values).toEqual(expectedDataTypeValues);
 });
 
-//TODO: Remove skip when the frontend is ready
-test.skip('can add color', async ({umbracoApi, umbracoUi}) => {
+test('can add color', async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const expectedDataTypeValues = [
     {
@@ -63,16 +62,15 @@ test.skip('can add color', async ({umbracoApi, umbracoUi}) => {
   await umbracoUi.dataType.goToDataType(dataTypeName);
 
   // Act
-  await umbracoUi.dataType.addColor(colorValue, colorLabel);
+  await umbracoUi.dataType.addColor(colorValue);
   await umbracoUi.dataType.clickSaveButton();
 
   // Assert
   dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
   expect(dataTypeData.values).toEqual(expectedDataTypeValues);
 });
 
-// TODO: remove .skip when the frontend is able to display the added color. Currently the added colors are not displayed after reloading page
-test.skip('can remove color', async ({umbracoApi, umbracoUi}) => {
+test('can remove color', async ({umbracoApi, umbracoUi}) => {  
   // Arrange
   const removedDataTypeValues = [
     {

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/CheckboxList.spec.ts

@@ -0,0 +1,98 @@
+import {test} from '@umbraco/playwright-testhelpers';
+import {expect} from "@playwright/test";
+
+const dataTypeName = 'Checkbox list';
+let dataTypeDefaultData = null; 
+let dataTypeData = null;
+
+test.beforeEach(async ({umbracoUi, umbracoApi}) => {
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.dataType.goToSettingsTreeItem('Data Types');
+  dataTypeDefaultData = await umbracoApi.dataType.getByName(dataTypeName);
+});
+
+test.afterEach(async ({umbracoApi}) => {
+  if (dataTypeDefaultData !== null) {
+    await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData);   
+  }   
+});
+
+test('can add option', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const optionName = 'Test option';
+  const expectedDataTypeValues = [
+    {
+      "alias": "items",
+      "value": [optionName]
+    }
+  ];
+  // Remove all existing options
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  dataTypeData.values = [];
+  await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);   
+  await umbracoUi.dataType.goToDataType(dataTypeName);
+
+  // Act
+  await umbracoUi.dataType.clickAddOptionButton();
+  await umbracoUi.dataType.enterOptionName(optionName);
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  expect(dataTypeData.values).toEqual(expectedDataTypeValues);
+});
+
+test('can remove option', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const removedOptionName = 'Removed Option';
+  const removedOptionValues = [
+    {
+      "alias": "items",
+      "value": [removedOptionName]
+    }
+  ];
+  // Remove all existing options and add an option to remove
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  dataTypeData.values = removedOptionValues;
+  await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);  
+  await umbracoUi.dataType.goToDataType(dataTypeName);
+
+  // Act
+  await umbracoUi.dataType.removeOptionByName(removedOptionName);
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  expect(dataTypeData.values).toEqual([]);
+});
+
+test('can update option', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const optionName = 'Test option';
+  const updatedOptionName = 'Updated option';
+  const optionValues = [
+    {
+      "alias": "items",
+      "value": [optionName]
+    }
+  ];
+  const expectedOptionValues = [
+    {
+      "alias": "items",
+      "value": [updatedOptionName]
+    }
+  ];
+  // Remove all existing options and add an option to update
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  dataTypeData.values = optionValues;
+  await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);  
+  await umbracoUi.dataType.goToDataType(dataTypeName);
+
+  // Act
+  await umbracoUi.dataType.enterOptionName(updatedOptionName);
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  expect(dataTypeData.values).toEqual(expectedOptionValues);
+});

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ContentPicker.spec.ts

@@ -0,0 +1,122 @@
+import {test} from '@umbraco/playwright-testhelpers';
+import {expect} from "@playwright/test";
+
+const dataTypeName = 'Content Picker';
+let dataTypeDefaultData = null;
+let dataTypeData = null;
+
+test.beforeEach(async ({umbracoUi, umbracoApi}) => {
+  await umbracoUi.goToBackOffice();
+  await umbracoUi.dataType.goToSettingsTreeItem('Data Types');
+  dataTypeDefaultData = await umbracoApi.dataType.getByName(dataTypeName);
+});
+
+test.afterEach(async ({umbracoApi}) => {
+  if (dataTypeDefaultData !== null) {
+    await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData);   
+  }   
+});
+
+test('can show open button', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedDataTypeValues = {
+    "alias": "showOpenButton",
+    "value": true
+  };
+  await umbracoUi.dataType.goToDataType(dataTypeName);
+
+  // Act
+  await umbracoUi.dataType.clickShowOpenButtonSlider();
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  expect(dataTypeData.values).toContainEqual(expectedDataTypeValues);
+});
+
+test('can ignore user start nodes', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedDataTypeValues = {
+    "alias": "ignoreUserStartNodes",
+    "value": true
+  };
+  await umbracoUi.dataType.goToDataType(dataTypeName);
+
+  // Act
+  await umbracoUi.dataType.clickIgnoreUserStartNodesSlider();
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  expect(dataTypeData.values).toContainEqual(expectedDataTypeValues);
+});
+
+test('can add start node', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  // Create content
+  const documentTypeName = 'TestDocumentType';
+  const contentName = 'TestStartNode';
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+  const documentTypeId = await umbracoApi.documentType.createDefaultDocumentTypeWithAllowAsRoot(documentTypeName);
+  await umbracoApi.document.ensureNameNotExists(contentName);
+  const contentId = await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  expect(await umbracoApi.document.doesExist(contentId)).toBeTruthy();
+
+  const expectedDataTypeValues = {
+    "alias": "startNodeId",
+    "value": contentId
+  };
+  await umbracoUi.dataType.goToDataType(dataTypeName);
+
+  // Act
+  await umbracoUi.dataType.clickChooseButton();
+  await umbracoUi.dataType.addContentStartNode(contentName);
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  expect(dataTypeData.values).toContainEqual(expectedDataTypeValues);
+
+  // Clean
+  await umbracoApi.document.ensureNameNotExists(contentName);
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+});
+
+test('can remove start node', async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  // Create content
+  const documentTypeName = 'TestDocumentType';
+  const contentName = 'TestStartNode';
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+  const documentTypeId = await umbracoApi.documentType.createDefaultDocumentTypeWithAllowAsRoot(documentTypeName);
+  await umbracoApi.document.ensureNameNotExists(contentName);
+  const contentId = await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
+  expect(await umbracoApi.document.doesExist(contentId)).toBeTruthy();
+
+  const expectedDataTypeValues = {
+    "alias": "startNodeId",
+    "value": ""
+  }
+  const removedDataTypeValues = [{
+    "alias": "startNodeId",
+    "value": contentId
+  }];
+
+  // Remove all existing values and add a start node to remove
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  dataTypeData.values = removedDataTypeValues;
+  await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);
+  await umbracoUi.dataType.goToDataType(dataTypeName);
+
+  // Act
+  await umbracoUi.dataType.removeContentStartNode(contentName);
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  expect(dataTypeData.values).toContainEqual(expectedDataTypeValues);
+
+  // Clean
+  await umbracoApi.document.ensureNameNotExists(contentName);
+  await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
+});

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts

@@ -2,7 +2,8 @@
 import {expect} from "@playwright/test";
 
 const dataTypeName = 'TestDataType';
-const editorAlias = 'Umbraco.DateTime';
+const editorAlias = 'Umbraco.ColorPicker';
+const propertyEditorName = 'Color Picker';
 
 test.beforeEach(async ({umbracoApi, umbracoUi}) => {
   await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
@@ -20,14 +21,16 @@ test('can create a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi})
   await umbracoUi.dataType.clickCreateButton();
   await umbracoUi.dataType.clickNewDataTypeThreeDotsButton();
   await umbracoUi.dataType.enterDataTypeName(dataTypeName);
+  await umbracoUi.dataType.clickSelectAPropertyEditorButton();
+  await umbracoUi.dataType.selectAPropertyEditor(propertyEditorName);
   await umbracoUi.dataType.clickSaveButton();
 
   // Assert
   await umbracoUi.dataType.isSuccessNotificationVisible();
   expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
 });
 
-test('can update a data type name', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
+test('can rename a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const wrongDataTypeName = 'Wrong Data Type';
   await umbracoApi.dataType.ensureNameNotExists(wrongDataTypeName);
@@ -44,7 +47,7 @@ test('can update a data type name', {tag: '@smoke'}, async ({umbracoApi, umbraco
   expect(await umbracoApi.dataType.doesNameExist(wrongDataTypeName)).toBeFalsy();
 });
 
-test.skip('can delete a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
+test('can delete a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
   // Arrange
   await umbracoApi.dataType.create(dataTypeName, editorAlias, []);
   expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
@@ -58,7 +61,7 @@ test.skip('can delete a data type', {tag: '@smoke'}, async ({umbracoApi, umbraco
   expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeFalsy();
 });
 
-test.skip('can change Property Editor in a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
+test('can change property editor in a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const updatedEditorName = 'Text Area';
   const updatedEditorAlias = 'Umbraco.TextArea';
@@ -70,7 +73,7 @@ test.skip('can change Property Editor in a data type', {tag: '@smoke'}, async ({
   // Act
   await umbracoUi.dataType.goToDataType(dataTypeName);
   await umbracoUi.dataType.clickChangeButton();
-  await umbracoUi.dataType.selectPropertyEditorUIByName(updatedEditorName);
+  await umbracoUi.dataType.selectAPropertyEditor(updatedEditorName);
   await umbracoUi.dataType.clickSaveButton();
 
   // Assert
@@ -79,3 +82,36 @@ test.skip('can change Property Editor in a data type', {tag: '@smoke'}, async ({
   expect(dataTypeData.editorAlias).toBe(updatedEditorAlias);
   expect(dataTypeData.editorUiAlias).toBe(updatedEditorUiAlias);
 });
+
+test('cannot create a data type without selecting the property editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
+  // Act
+  await umbracoUi.dataType.clickActionsMenuAtRoot();
+  await umbracoUi.dataType.clickCreateButton();
+  await umbracoUi.dataType.clickNewDataTypeThreeDotsButton();
+  await umbracoUi.dataType.enterDataTypeName(dataTypeName);
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  await umbracoUi.dataType.isFailedStateButtonVisible();
+  expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeFalsy();
+});
+
+test('can change settings', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
+  // Arrange
+  const expectedDataTypeValues = {
+    alias: "useLabel",
+    value: true
+  };
+  await umbracoApi.dataType.create(dataTypeName, editorAlias, []);
+  expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
+
+  // Act
+  await umbracoUi.dataType.goToDataType(dataTypeName);
+  await umbracoUi.dataType.clickIncludeLabelsSlider();
+  await umbracoUi.dataType.clickSaveButton();
+
+  // Assert
+  await umbracoUi.dataType.isSuccessNotificationVisible();
+  const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
+  expect(dataTypeData.values).toContainEqual(expectedDataTypeValues);
+});