Skip to content

Commit 615fcdd

Browse files
V16 QA Updated acceptance tests with skip() and fixme() tag (#19397)
* Updated nightly E2E pipeline * Fixed failing E2E tests * Skipped content tests wirh list view content due to an issue * Updated tests due to UI changes * Updated fixme and skip tests - part 1 * Removed this file because the tests are already covered elsewhere * Updated fixme() tests * Updated skip() tests * Bumped version * Bumped version * Bumped version * Removed notification verification * Removed the step to verify the notification for save action * Fixed the failing tests * Updated name of permission * Bumped version * Fixed failing tests * Bumped testHelpers * Removed tests related to tiptap toolbar as they are covered in another class * Cleaned up * Added more waits * Cleaned up * Added step to ensure redirect URL is created when renaming content. * Restructured the tests * Removed unnecessary steps * Fixed isItemVisibleInRecycleBin * Fixed isItemVisibleInRecycleBin * Bumped version * Added more wait for the deletion to complete * Added waits for the deletion to complete * Added more waits * Removed unnecessary waits * Added more waits to improve test stability * Added skip for the flaky test * Added test for removing a stylesheet in a block grid editor * Updated test due to api helper changes * Bumped version * Fixed failing smoke test --------- Co-authored-by: Andreas Zerbst <[email protected]>
1 parent 8d60966 commit 615fcdd

File tree

61 files changed

+229
-437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+229
-437
lines changed

build/nightly-E2E-test-pipelines.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ schedules:
99
branches:
1010
include:
1111
- v15/dev
12-
- release/16.0
1312
- main
1413

1514
parameters:
@@ -483,4 +482,4 @@ stages:
483482
testResultsFormat: 'JUnit'
484483
testResultsFiles: '*.xml'
485484
searchFolder: "tests/Umbraco.Tests.AcceptanceTest/results"
486-
testRunTitle: "$(Agent.JobName)"
485+
testRunTitle: "$(Agent.JobName)"

tests/Umbraco.Tests.AcceptanceTest/package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/BlockGridArea.spec.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ test('can create content with block grid area with row span', async ({umbracoApi
155155
await umbracoUi.content.doesBlockAreaContainRowSpan(firstElementTypeName, firstAreaName, rowSpan, 0);
156156
});
157157

158-
// Remove fixme when this issue is fixed https://github.com/umbraco/Umbraco-CMS/issues/18639
159-
test.fixme('can create content with block grid area with min allowed', async ({umbracoApi, umbracoUi}) => {
158+
test('can create content with block grid area with min allowed', async ({umbracoApi, umbracoUi}) => {
160159
// Arrange
161160
firstElementTypeId = await umbracoApi.documentType.createEmptyElementType(firstElementTypeName);
162161
const secondElementTypeId = await umbracoApi.documentType.createEmptyElementType(secondElementTypeName);
@@ -169,7 +168,7 @@ test.fixme('can create content with block grid area with min allowed', async ({u
169168
await umbracoUi.content.goToContentWithName(contentName);
170169

171170
// Act
172-
await umbracoUi.content.clickAddBlockGridElementWithName(firstElementTypeName);
171+
await umbracoUi.content.clickAddBlockGridElementWithName('content');
173172
await umbracoUi.content.clickSelectBlockElementWithName(firstElementTypeName);
174173
await umbracoUi.content.clickLinkWithName(areaCreateLabel);
175174
await umbracoUi.content.clickSelectBlockElementInAreaWithName(secondElementTypeName);
@@ -187,8 +186,7 @@ test.fixme('can create content with block grid area with min allowed', async ({u
187186
await umbracoApi.documentType.ensureNameNotExists(secondElementTypeName);
188187
});
189188

190-
// Remove fixme when this issue is fixed https://github.com/umbraco/Umbraco-CMS/issues/18639
191-
test.fixme('can create content with block grid area with max allowed', async ({umbracoApi, umbracoUi}) => {
189+
test('can create content with block grid area with max allowed', async ({umbracoApi, umbracoUi}) => {
192190
// Arrange
193191
firstElementTypeId = await umbracoApi.documentType.createEmptyElementType(firstElementTypeName);
194192
const secondElementTypeId = await umbracoApi.documentType.createEmptyElementType(secondElementTypeName);
@@ -201,11 +199,11 @@ test.fixme('can create content with block grid area with max allowed', async ({u
201199
await umbracoUi.content.goToContentWithName(contentName);
202200

203201
// Act
204-
await umbracoUi.content.clickAddBlockGridElementWithName(firstElementTypeName);
202+
await umbracoUi.content.clickAddBlockGridElementWithName('content');
205203
await umbracoUi.content.clickSelectBlockElementWithName(firstElementTypeName);
206204
await umbracoUi.content.clickLinkWithName(areaCreateLabel);
207205
await umbracoUi.content.clickSelectBlockElementInAreaWithName(secondElementTypeName);
208-
await umbracoUi.content.isTextWithExactNameVisible('Maximum 0 entries, 1 too many.');
206+
await umbracoUi.content.isTextWithExactNameVisible('Maximum 0 entries, you have entered 1 too many.');
209207
await umbracoUi.content.clickSaveAndPublishButton();
210208
await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.documentCouldNotBePublished);
211209
await umbracoUi.content.removeBlockFromArea(firstElementTypeName, firstAreaName, secondElementTypeName);

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ComplexBlockGridTest.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ test('can update property value nested in a block grid area with an RTE with a b
9595
await umbracoUi.content.clickAddBlockGridElementWithName(richTextEditorElementTypeName);
9696
await umbracoUi.content.clickExactLinkWithName(richTextEditorElementTypeName);
9797
await umbracoUi.content.clickInsertBlockButton();
98-
await umbracoUi.content.clickExactLinkWithName(blockListElementTypeName);
98+
await umbracoUi.content.clickExactLinkWithName(blockListElementTypeName, true);
9999
await umbracoUi.content.clickAddBlockGridElementWithName(textStringElementTypeName);
100100
await umbracoUi.content.clickExactLinkWithName(textStringElementTypeName);
101101
// Enter text in the textstring block that won't match regex

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ContentWithBlockGrid.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ test('can set the number of columns for the layout in the content', async ({umbr
227227
expect(layoutValue[0].columnSpan).toBe(gridColumns);
228228
});
229229

230-
// TODO: Remove skip when front-end is ready. Currently, it is impossible to create content with blockgrid that has a setting model
231-
test.skip('can add settings model for the block in the content', async ({umbracoApi, umbracoUi}) => {
230+
test('can add settings model for the block in the content', async ({umbracoApi, umbracoUi}) => {
232231
// Arrange
233232
const contentBlockInputText = 'This is textstring';
234233
const settingBlockInputText = 'This is textarea';

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/VariantBlockGrid.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ test('can not create unsupported invariant document type with invariant block gr
8080

8181
// Assert
8282
await umbracoUi.content.isFailedStateButtonVisible();
83-
await umbracoUi.content.isErrorNotificationVisible();
8483
await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.documentCouldNotBePublished);
8584
expect(await umbracoApi.document.isDocumentPublished(contentId)).toBeFalsy();
8685
});
@@ -101,7 +100,6 @@ test('can not create unsupported invariant document type with invariant block gr
101100

102101
// Assert
103102
await umbracoUi.content.isFailedStateButtonVisible();
104-
await umbracoUi.content.isErrorNotificationVisible();
105103
await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.documentCouldNotBePublished);
106104
expect(await umbracoApi.document.isDocumentPublished(contentId)).toBeFalsy();
107105
});

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/ContentWithBlockList.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ test('can set the label of block element in the content', async ({umbracoApi, um
178178
await umbracoUi.content.doesBlockElementHaveName(blockLabel);
179179
});
180180

181-
// TODO: Remove skip when front-end is ready. Currently, it is impossible to create content with blocklist that has a setting model
182-
test.skip('can add settings model for the block in the content', async ({umbracoApi, umbracoUi}) => {
181+
test('can add settings model for the block in the content', async ({umbracoApi, umbracoUi}) => {
183182
// Arrange
184183
const contentBlockInputText = 'This is textstring';
185184
const settingBlockInputText = 'This is textarea';

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/VariantBlockList.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ test('can not create unsupported invariant document type with invariant block li
8080

8181
// Assert
8282
await umbracoUi.content.isFailedStateButtonVisible();
83-
await umbracoUi.content.isErrorNotificationVisible();
8483
await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.documentCouldNotBePublished);
8584
expect(await umbracoApi.document.isDocumentPublished(contentId)).toBeFalsy();
8685
});
@@ -100,7 +99,6 @@ test('can not create unsupported invariant document type with invariant block li
10099

101100
// Assert
102101
await umbracoUi.content.isFailedStateButtonVisible();
103-
await umbracoUi.content.isErrorNotificationVisible();
104102
await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.documentCouldNotBePublished);
105103
expect(await umbracoApi.document.isDocumentPublished(contentId)).toBeFalsy();
106104
});

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ConstantHelper, test} from '@umbraco/playwright-testhelpers';
1+
import {ConstantHelper, NotificationConstantHelper, test} from '@umbraco/playwright-testhelpers';
22
import {expect} from "@playwright/test";
33

44
const contentName = 'TestContent';
@@ -92,7 +92,7 @@ test('can open content picker in the content', async ({umbracoApi, umbracoUi}) =
9292
await umbracoApi.dataType.ensureNameNotExists(customDataTypeName);
9393
});
9494

95-
test('can choose start node for the content picker in the content', async ({umbracoApi, umbracoUi}) => {
95+
test('can create content with content picker without ignore start node', async ({umbracoApi, umbracoUi}) => {
9696
// Arrange
9797
const customDataTypeName = 'CustomContentPicker';
9898
const childContentPickerDocumentTypeName = 'ChildDocumentTypeForContentPicker';
@@ -111,19 +111,19 @@ test('can choose start node for the content picker in the content', async ({umbr
111111

112112
// Act
113113
await umbracoUi.content.goToContentWithName(contentName);
114-
await umbracoUi.content.clickChooseButton();
114+
await umbracoUi.content.addContentPicker(childContentPickerName);
115+
await umbracoUi.content.clickSaveAndPublishButton();
115116

116117
// Assert
117-
await umbracoUi.content.isContentNameVisible(childContentPickerName);
118-
await umbracoUi.content.isContentNameVisible(contentPickerName, false);
118+
await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.published);
119119

120120
// Clean
121121
await umbracoApi.dataType.ensureNameNotExists(customDataTypeName);
122122
await umbracoApi.document.ensureNameNotExists(childContentPickerName);
123123
await umbracoApi.documentType.ensureNameNotExists(childContentPickerDocumentTypeName);
124124
});
125125

126-
test.skip('can ignore user start node for the content picker in the content', async ({umbracoApi, umbracoUi}) => {
126+
test('can create content with content picker with ignore start node', async ({umbracoApi, umbracoUi}) => {
127127
// Arrange
128128
const customDataTypeName = 'CustomContentPicker';
129129
const childContentPickerDocumentTypeName = 'ChildDocumentTypeForContentPicker';
@@ -142,11 +142,11 @@ test.skip('can ignore user start node for the content picker in the content', as
142142

143143
// Act
144144
await umbracoUi.content.goToContentWithName(contentName);
145-
await umbracoUi.content.clickChooseButton();
145+
await umbracoUi.content.addContentPicker(childContentPickerName);
146+
await umbracoUi.content.clickSaveAndPublishButton();
146147

147148
// Assert
148-
await umbracoUi.content.isContentNameVisible(childContentPickerName);
149-
await umbracoUi.content.isContentNameVisible(contentPickerName);
149+
await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.published);
150150

151151
// Clean
152152
await umbracoApi.dataType.ensureNameNotExists(customDataTypeName);

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ test('can add decimal number to the decimal in the content section', async ({umb
107107
expect(contentData.values[0].value).toEqual(decimal);
108108
});
109109

110-
// Skip this test as currently there is no code editor property editor available.
111-
test.skip('can create content with the custom data type with code editor property editor', async ({umbracoApi, umbracoUi}) => {
110+
test('can create content with the custom data type with code editor property editor', async ({umbracoApi, umbracoUi}) => {
112111
// Arrange
113112
customDataTypeName = 'Code Editor';
114113
const customDataTypeId = await umbracoApi.dataType.createCodeEditorDataType(customDataTypeName);

0 commit comments

Comments
 (0)