Skip to content

V15 Added second level block acceptance tests #19264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: v15/dev
Choose a base branch
from
Open

V15 Added second level block acceptance tests #19264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
78664dd
Added tests
andr317c May 5, 2025
4e141fe
Merge remote-tracking branch 'origin/v15/dev' into v15/QA/add-second-…
andr317c May 5, 2025
f4ee06b
Added rest of tests for grid
andr317c May 5, 2025
87cd609
Added more tests
andr317c May 6, 2025
a601f84
Cleaned up tests
andr317c May 7, 2025
3c1e21a
bumped version
andr317c May 7, 2025
f4d7b5b
Merge remote-tracking branch 'origin/v15/dev' into v15/QA/add-second-…
andr317c May 7, 2025
c1e4845
Fixed
andr317c May 7, 2025
d8da91f
Run tests
andr317c May 7, 2025
c60f906
Merge branch 'v15/dev' into v15/QA/add-second-level-block-tests
andr317c May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions tests/Umbraco.Tests.AcceptanceTest/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions tests/Umbraco.Tests.AcceptanceTest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"testSqlite": "npx playwright test DefaultConfig --grep-invert \"Users\"",
"all": "npx playwright test",
"createTest": "node createTest.js",
"smokeTest": "npx playwright test DefaultConfig --grep \"@smoke\"",
"smokeTest": "npx playwright test DefaultConfig --grep \"SecondLevel\"",
"OriginalsmokeTest": "npx playwright test DefaultConfig --grep \"@smoke\"",
"smokeTestSqlite": "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\""
},
"devDependencies": {
Expand All @@ -21,7 +22,7 @@
},
"dependencies": {
"@umbraco/json-models-builders": "^2.0.33",
"@umbraco/playwright-testhelpers": "^15.0.50",
"@umbraco/playwright-testhelpers": "^15.0.51",
"camelize": "^1.0.0",
"dotenv": "^16.3.1",
"node-fetch": "^2.6.7"
Expand Down
161 changes: 161 additions & 0 deletions ...s.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/SecondLevelBlockProperties.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
import {AliasHelper, ConstantHelper, NotificationConstantHelper, test} from '@umbraco/playwright-testhelpers';
import {expect} from "@playwright/test";

// Content Name
const contentName = 'ContentName';

// Document Type
const documentTypeName = 'DocumentTypeName';
let documentTypeId = null;
const documentTypeGroupName = 'DocumentGroup';

// Block Grid
const blockGridDataTypeName = 'BlockGridName';
let blockGridDataTypeId = null;

// Text String
const textStringElementTypeName = 'TextStringElementName';
let textStringElementTypeId = null;
let textStringGroupName = 'TextGroup';
const textStringDataTypeName = 'Textstring';

test.beforeEach(async ({umbracoApi}) => {
await umbracoApi.document.ensureNameNotExists(contentName);
await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
await umbracoApi.dataType.ensureNameNotExists(blockGridDataTypeName);
});

test.afterEach(async ({umbracoApi}) => {
await umbracoApi.document.ensureNameNotExists(contentName);
await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
await umbracoApi.dataType.ensureNameNotExists(blockGridDataTypeName);
});

test('can publish a block grid editor with a rich text editor', async ({umbracoApi, umbracoUi}) => {
// Arrange
const richTextEditorValue = 'Hello World';
const expectedRichTextEditorOutputValue = '<p>Hello World</p>';
const richTextDataTypeName = 'RichTextDataTypeName';
const richTextElementTypeName = 'RichTextElementName';
const richTextElementGroupName = 'RichTextElementGroupName';
await umbracoApi.dataType.ensureNameNotExists(richTextDataTypeName);
await umbracoApi.documentType.ensureNameNotExists(richTextElementTypeName);

const richTextEditorDataTypeId = await umbracoApi.dataType.createDefaultTiptapDataType(richTextDataTypeName);
const richTextElementTypeId = await umbracoApi.documentType.createDefaultElementType(richTextElementTypeName, richTextElementGroupName, richTextDataTypeName, richTextEditorDataTypeId);
blockGridDataTypeId = await umbracoApi.dataType.createBlockGridWithABlockAndAllowAtRoot(blockGridDataTypeName, richTextElementTypeId, true);
documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, blockGridDataTypeName, blockGridDataTypeId, documentTypeGroupName);
await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
await umbracoUi.goToBackOffice();
await umbracoUi.content.goToSection(ConstantHelper.sections.content);
await umbracoUi.content.goToContentWithName(contentName);

// Act
await umbracoUi.content.clickAddBlockElementButton();
await umbracoUi.content.clickBlockElementWithName(richTextElementTypeName);
await umbracoUi.content.enterRTETipTapEditor(richTextEditorValue);
await umbracoUi.content.clickCreateModalButton();
await umbracoUi.content.clickSaveAndPublishButton();

// Assert
await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.saved);
await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.published);
// Asserts that the value in the RTE is as expected
const documentData = await umbracoApi.document.getByName(contentName);
const documentValues = documentData.values.find(value => value.alias === AliasHelper.toAlias(blockGridDataTypeName));
expect(documentValues.value.contentData[0].values[0].value.markup).toContain(expectedRichTextEditorOutputValue);

// Clean
await umbracoApi.dataType.ensureNameNotExists(richTextDataTypeName);
await umbracoApi.documentType.ensureNameNotExists(richTextElementTypeName);
});

test('can publish a block grid editor with a block list editor', async ({umbracoApi, umbracoUi}) => {
// Arrange
const textStringValue = 'Hello World';
const blockListDataTypeName = 'BlockListName';
const blockListElementTypeName = 'BlockListElementName';
const blockListElementGroupName = 'BlockListElementGroupName';
await umbracoApi.dataType.ensureNameNotExists(blockListDataTypeName);
await umbracoApi.documentType.ensureNameNotExists(textStringElementTypeName);
await umbracoApi.documentType.ensureNameNotExists(blockListElementTypeName);

const textStringDataType = await umbracoApi.dataType.getByName(textStringDataTypeName);
textStringElementTypeId = await umbracoApi.documentType.createDefaultElementType(textStringElementTypeName, textStringGroupName, textStringDataTypeName, textStringDataType.id);
const blockListDataTypeId = await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListDataTypeName, textStringElementTypeId);
const blockListElementTypeId = await umbracoApi.documentType.createDefaultElementType(blockListElementTypeName, blockListElementGroupName, blockListDataTypeName, blockListDataTypeId);
blockGridDataTypeId = await umbracoApi.dataType.createBlockGridWithABlockAndAllowAtRoot(blockGridDataTypeName, blockListElementTypeId, true);
documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, blockGridDataTypeName, blockGridDataTypeId, documentTypeGroupName);
await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
await umbracoUi.goToBackOffice();
await umbracoUi.content.goToSection(ConstantHelper.sections.content);
await umbracoUi.content.goToContentWithName(contentName);

// Act
await umbracoUi.content.clickAddBlockElementButton();
await umbracoUi.content.clickBlockElementWithName(blockListElementTypeName);
await umbracoUi.content.clickAddBlockWithNameButton(textStringElementTypeName);
await umbracoUi.content.clickLinkWithName(textStringElementTypeName, true);
await umbracoUi.content.enterTextstring(textStringValue);
await umbracoUi.content.clickCreateForModalWithHeadline('Add ' + textStringElementTypeName);
await umbracoUi.content.clickCreateModalButton();
await umbracoUi.content.clickSaveAndPublishButton();

// Assert
await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.saved);
await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.published);
// Asserts that the value in the BlockList is as expected
const documentData = await umbracoApi.document.getByName(contentName);
const documentValues = documentData.values.find(value => value.alias === AliasHelper.toAlias(blockGridDataTypeName));
expect(documentValues.value.contentData[0].values[0].value.contentData[0].values[0].value).toContain(textStringValue);

// Clean
await umbracoApi.dataType.ensureNameNotExists(blockListDataTypeName);
await umbracoApi.documentType.ensureNameNotExists(textStringElementTypeName);
await umbracoApi.documentType.ensureNameNotExists(blockListElementTypeName);
});

test('can publish a block grid editor with a block grid editor', async ({umbracoApi, umbracoUi}) => {
// Arrange
const textStringValue = 'Hello World';
const secondBlockGridDataTypeName = 'SecondBlockGridDataTypeName';
const blockGridElementTypeName = 'BlockGridElementTypeName';
const blockGridElementGroupName = 'BlockGridElementGroupName';
await umbracoApi.dataType.ensureNameNotExists(secondBlockGridDataTypeName);
await umbracoApi.documentType.ensureNameNotExists(textStringElementTypeName);
await umbracoApi.documentType.ensureNameNotExists(blockGridElementTypeName);

const textStringDataType = await umbracoApi.dataType.getByName(textStringDataTypeName);
textStringElementTypeId = await umbracoApi.documentType.createDefaultElementType(textStringElementTypeName, textStringGroupName, textStringDataTypeName, textStringDataType.id);
const secondBlockGridDataTypeId = await umbracoApi.dataType.createBlockGridWithABlockAndAllowAtRoot(secondBlockGridDataTypeName, textStringElementTypeId);
const blockGridElementTypeId = await umbracoApi.documentType.createDefaultElementType(blockGridElementTypeName, blockGridElementGroupName, secondBlockGridDataTypeName, secondBlockGridDataTypeId);
blockGridDataTypeId = await umbracoApi.dataType.createBlockGridWithABlockAndAllowAtRoot(blockGridDataTypeName, blockGridElementTypeId, true);
documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, blockGridDataTypeName, blockGridDataTypeId, documentTypeGroupName);
await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
await umbracoUi.goToBackOffice();
await umbracoUi.content.goToSection(ConstantHelper.sections.content);
await umbracoUi.content.goToContentWithName(contentName);

// Act
await umbracoUi.content.clickAddBlockElementButton();
await umbracoUi.content.clickLinkWithName(blockGridElementTypeName, true);
await umbracoUi.content.clickAddBlockWithNameButton(textStringElementTypeName);
await umbracoUi.content.clickLinkWithName(textStringElementTypeName, true);
await umbracoUi.content.enterTextstring(textStringValue);
await umbracoUi.content.clickCreateForModalWithHeadline('Add ' + textStringElementTypeName);
await umbracoUi.content.clickCreateModalButton();
await umbracoUi.content.clickSaveAndPublishButton();

// Assert
await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.saved);
await umbracoUi.content.doesSuccessNotificationHaveText(NotificationConstantHelper.success.published);
// Asserts that the value in the BlockGrid is as expected
const documentData = await umbracoApi.document.getByName(contentName);
const documentValues = documentData.values.find(value => value.alias === AliasHelper.toAlias(blockGridDataTypeName));
expect(documentValues.value.contentData[0].values[0].value.contentData[0].values[0].value).toContain(textStringValue);

// Clean
await umbracoApi.dataType.ensureNameNotExists(secondBlockGridDataTypeName);
await umbracoApi.documentType.ensureNameNotExists(textStringElementTypeName);
await umbracoApi.documentType.ensureNameNotExists(blockGridElementTypeName);
});
Loading
Loading