Skip to content

Commit b56d143

Browse files
andr317candr317c
authored
V14 QA remove test describe (#16330)
* Removed test.describe and fixed indentation * Removed test.describe, fixed indentation and moved test file to settings
1 parent 03be7b8 commit b56d143

31 files changed

+3130
-3202
lines changed

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

Lines changed: 85 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2,102 +2,100 @@
22
import {expect} from "@playwright/test";
33

44
const dataTypeName = 'Approved Color';
5-
test.describe(`${dataTypeName} tests`, () => {
6-
let dataTypeDefaultData = null;
7-
let dataTypeData = null;
8-
const colorValue = '#ffffff';
9-
const colorLabel = 'TestColor';
5+
let dataTypeDefaultData = null;
6+
let dataTypeData = null;
7+
const colorValue = '#ffffff';
8+
const colorLabel = 'TestColor';
109

11-
test.beforeEach(async ({umbracoUi, umbracoApi}) => {
12-
await umbracoUi.goToBackOffice();
13-
await umbracoUi.dataType.goToSettingsTreeItem('Data Types');
14-
dataTypeDefaultData = await umbracoApi.dataType.getByName(dataTypeName);
15-
});
10+
test.beforeEach(async ({umbracoUi, umbracoApi}) => {
11+
await umbracoUi.goToBackOffice();
12+
await umbracoUi.dataType.goToSettingsTreeItem('Data Types');
13+
dataTypeDefaultData = await umbracoApi.dataType.getByName(dataTypeName);
14+
});
1615

17-
test.afterEach(async ({umbracoApi}) => {
18-
if (dataTypeDefaultData !== null) {
19-
await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData);
20-
}
21-
});
16+
test.afterEach(async ({umbracoApi}) => {
17+
if (dataTypeDefaultData !== null) {
18+
await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData);
19+
}
20+
});
2221

23-
test('can include label', async ({umbracoApi, umbracoUi}) => {
24-
// Arrange
25-
const expectedDataTypeValues = [
26-
{
27-
"alias": "useLabel",
28-
"value": true
29-
}
30-
];
31-
// Remove all existing values
32-
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
33-
dataTypeData.values = [];
34-
await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);
35-
await umbracoUi.dataType.goToDataType(dataTypeName);
22+
test('can include label', async ({umbracoApi, umbracoUi}) => {
23+
// Arrange
24+
const expectedDataTypeValues = [
25+
{
26+
"alias": "useLabel",
27+
"value": true
28+
}
29+
];
30+
// Remove all existing values
31+
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
32+
dataTypeData.values = [];
33+
await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);
34+
await umbracoUi.dataType.goToDataType(dataTypeName);
3635

37-
// Act
38-
await umbracoUi.dataType.clickIncludeLabelsSlider();
39-
await umbracoUi.dataType.clickSaveButton();
36+
// Act
37+
await umbracoUi.dataType.clickIncludeLabelsSlider();
38+
await umbracoUi.dataType.clickSaveButton();
4039

41-
// Assert
42-
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
43-
expect(dataTypeData.values).toEqual(expectedDataTypeValues);
44-
});
40+
// Assert
41+
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
42+
expect(dataTypeData.values).toEqual(expectedDataTypeValues);
43+
});
4544

46-
//TODO: Remove skip when the frontend is ready
47-
test.skip('can add color', async ({umbracoApi, umbracoUi}) => {
48-
// Arrange
49-
const expectedDataTypeValues = [
50-
{
51-
"alias": "items",
52-
"value": [
53-
{
54-
"value": colorValue,
55-
"label": colorLabel
56-
}
57-
]
58-
}
59-
];
60-
// Remove all existing values
61-
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
62-
dataTypeData.values = [];
63-
await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);
64-
await umbracoUi.dataType.goToDataType(dataTypeName);
45+
//TODO: Remove skip when the frontend is ready
46+
test.skip('can add color', async ({umbracoApi, umbracoUi}) => {
47+
// Arrange
48+
const expectedDataTypeValues = [
49+
{
50+
"alias": "items",
51+
"value": [
52+
{
53+
"value": colorValue,
54+
"label": colorLabel
55+
}
56+
]
57+
}
58+
];
59+
// Remove all existing values
60+
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
61+
dataTypeData.values = [];
62+
await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);
63+
await umbracoUi.dataType.goToDataType(dataTypeName);
6564

66-
// Act
67-
await umbracoUi.dataType.addColor(colorValue, colorLabel);
68-
await umbracoUi.dataType.clickSaveButton();
65+
// Act
66+
await umbracoUi.dataType.addColor(colorValue, colorLabel);
67+
await umbracoUi.dataType.clickSaveButton();
6968

70-
// Assert
71-
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
72-
expect(dataTypeData.values).toEqual(expectedDataTypeValues);
73-
});
69+
// Assert
70+
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
71+
expect(dataTypeData.values).toEqual(expectedDataTypeValues);
72+
});
7473

75-
// TODO: remove .skip when the frontend is able to display the added color. Currently the added colors are not displayed after reloading page
76-
test.skip('can remove color', async ({umbracoApi, umbracoUi}) => {
77-
// Arrange
78-
const removedDataTypeValues = [
79-
{
80-
"alias": "items",
81-
"value": [
82-
{
83-
"value": colorValue,
84-
"label": colorLabel
85-
}
86-
]
87-
}
88-
];
89-
// Remove all existing values and add a color to remove
90-
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
91-
dataTypeData.values = removedDataTypeValues;
92-
await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);
93-
await umbracoUi.dataType.goToDataType(dataTypeName);
74+
// TODO: remove .skip when the frontend is able to display the added color. Currently the added colors are not displayed after reloading page
75+
test.skip('can remove color', async ({umbracoApi, umbracoUi}) => {
76+
// Arrange
77+
const removedDataTypeValues = [
78+
{
79+
"alias": "items",
80+
"value": [
81+
{
82+
"value": colorValue,
83+
"label": colorLabel
84+
}
85+
]
86+
}
87+
];
88+
// Remove all existing values and add a color to remove
89+
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
90+
dataTypeData.values = removedDataTypeValues;
91+
await umbracoApi.dataType.update(dataTypeData.id, dataTypeData);
92+
await umbracoUi.dataType.goToDataType(dataTypeName);
9493

95-
// Act
96-
await umbracoUi.dataType.removeColorByValue(colorValue);
97-
await umbracoUi.dataType.clickSaveButton();
94+
// Act
95+
await umbracoUi.dataType.removeColorByValue(colorValue);
96+
await umbracoUi.dataType.clickSaveButton();
9897

99-
// Assert
100-
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
101-
expect(dataTypeData.values).toEqual([]);
102-
});
98+
// Assert
99+
dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
100+
expect(dataTypeData.values).toEqual([]);
103101
});

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

Lines changed: 63 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,81 @@
11
import {test} from '@umbraco/playwright-testhelpers';
22
import {expect} from "@playwright/test";
33

4-
test.describe('Data Types basic functionalities tests', () => {
5-
const dataTypeName = 'TestDataType';
6-
const editorAlias = 'Umbraco.DateTime';
4+
const dataTypeName = 'TestDataType';
5+
const editorAlias = 'Umbraco.DateTime';
76

8-
test.beforeEach(async ({umbracoApi, umbracoUi}) => {
9-
await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
10-
await umbracoUi.goToBackOffice();
11-
await umbracoUi.dataType.goToSettingsTreeItem('Data Types');
12-
});
7+
test.beforeEach(async ({umbracoApi, umbracoUi}) => {
8+
await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
9+
await umbracoUi.goToBackOffice();
10+
await umbracoUi.dataType.goToSettingsTreeItem('Data Types');
11+
});
1312

14-
test.afterEach(async ({umbracoApi}) => {
15-
await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
16-
});
13+
test.afterEach(async ({umbracoApi}) => {
14+
await umbracoApi.dataType.ensureNameNotExists(dataTypeName);
15+
});
1716

18-
test('can create a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
19-
// Act
20-
await umbracoUi.dataType.clickActionsMenuAtRoot();
21-
await umbracoUi.dataType.clickCreateButton();
22-
await umbracoUi.dataType.clickNewDataTypeThreeDotsButton();
23-
await umbracoUi.dataType.enterDataTypeName(dataTypeName);
24-
await umbracoUi.dataType.clickSaveButton();
17+
test('can create a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
18+
// Act
19+
await umbracoUi.dataType.clickActionsMenuAtRoot();
20+
await umbracoUi.dataType.clickCreateButton();
21+
await umbracoUi.dataType.clickNewDataTypeThreeDotsButton();
22+
await umbracoUi.dataType.enterDataTypeName(dataTypeName);
23+
await umbracoUi.dataType.clickSaveButton();
2524

26-
// Assert
27-
await umbracoUi.dataType.isSuccessNotificationVisible();
28-
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
29-
});
25+
// Assert
26+
await umbracoUi.dataType.isSuccessNotificationVisible();
27+
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
28+
});
3029

31-
test('can update a data type name', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
32-
// Arrange
33-
const wrongDataTypeName = 'Wrong Data Type';
34-
await umbracoApi.dataType.ensureNameNotExists(wrongDataTypeName);
35-
await umbracoApi.dataType.create(wrongDataTypeName, editorAlias, []);
36-
expect(await umbracoApi.dataType.doesNameExist(wrongDataTypeName)).toBeTruthy();
30+
test('can update a data type name', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
31+
// Arrange
32+
const wrongDataTypeName = 'Wrong Data Type';
33+
await umbracoApi.dataType.ensureNameNotExists(wrongDataTypeName);
34+
await umbracoApi.dataType.create(wrongDataTypeName, editorAlias, []);
35+
expect(await umbracoApi.dataType.doesNameExist(wrongDataTypeName)).toBeTruthy();
3736

38-
// Act
39-
await umbracoUi.dataType.goToDataType(wrongDataTypeName);
40-
await umbracoUi.dataType.enterDataTypeName(dataTypeName);
41-
await umbracoUi.dataType.clickSaveButton();
37+
// Act
38+
await umbracoUi.dataType.goToDataType(wrongDataTypeName);
39+
await umbracoUi.dataType.enterDataTypeName(dataTypeName);
40+
await umbracoUi.dataType.clickSaveButton();
4241

43-
// Assert
44-
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
45-
expect(await umbracoApi.dataType.doesNameExist(wrongDataTypeName)).toBeFalsy();
46-
});
42+
// Assert
43+
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
44+
expect(await umbracoApi.dataType.doesNameExist(wrongDataTypeName)).toBeFalsy();
45+
});
4746

48-
test.skip('can delete a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
49-
// Arrange
50-
await umbracoApi.dataType.create(dataTypeName, editorAlias, []);
51-
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
47+
test.skip('can delete a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
48+
// Arrange
49+
await umbracoApi.dataType.create(dataTypeName, editorAlias, []);
50+
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
5251

53-
// Act
54-
await umbracoUi.dataType.clickRootFolderCaretButton();
55-
await umbracoUi.dataType.deleteDataType(dataTypeName);
52+
// Act
53+
await umbracoUi.dataType.clickRootFolderCaretButton();
54+
await umbracoUi.dataType.deleteDataType(dataTypeName);
5655

57-
// Assert
58-
await umbracoUi.dataType.isSuccessNotificationVisible();
59-
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeFalsy();
60-
});
56+
// Assert
57+
await umbracoUi.dataType.isSuccessNotificationVisible();
58+
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeFalsy();
59+
});
6160

62-
test.skip('can change Property Editor in a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
63-
// Arrange
64-
const updatedEditorName = 'Text Area';
65-
const updatedEditorAlias = 'Umbraco.TextArea';
66-
const updatedEditorUiAlias = 'Umb.PropertyEditorUi.TextArea';
61+
test.skip('can change Property Editor in a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
62+
// Arrange
63+
const updatedEditorName = 'Text Area';
64+
const updatedEditorAlias = 'Umbraco.TextArea';
65+
const updatedEditorUiAlias = 'Umb.PropertyEditorUi.TextArea';
6766

68-
await umbracoApi.dataType.create(dataTypeName, editorAlias, []);
69-
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
67+
await umbracoApi.dataType.create(dataTypeName, editorAlias, []);
68+
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
7069

71-
// Act
72-
await umbracoUi.dataType.goToDataType(dataTypeName);
73-
await umbracoUi.dataType.clickChangeButton();
74-
await umbracoUi.dataType.selectPropertyEditorUIByName(updatedEditorName);
75-
await umbracoUi.dataType.clickSaveButton();
70+
// Act
71+
await umbracoUi.dataType.goToDataType(dataTypeName);
72+
await umbracoUi.dataType.clickChangeButton();
73+
await umbracoUi.dataType.selectPropertyEditorUIByName(updatedEditorName);
74+
await umbracoUi.dataType.clickSaveButton();
7675

77-
// Assert
78-
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
79-
const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
80-
expect(dataTypeData.editorAlias).toBe(updatedEditorAlias);
81-
expect(dataTypeData.editorUiAlias).toBe(updatedEditorUiAlias);
82-
});
76+
// Assert
77+
expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy();
78+
const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName);
79+
expect(dataTypeData.editorAlias).toBe(updatedEditorAlias);
80+
expect(dataTypeData.editorUiAlias).toBe(updatedEditorUiAlias);
8381
});

0 commit comments

Comments
 (0)