yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v16/dev'

Browse Source
This commit is contained in:
Jacob Overgaard
2025-11-04 14:09:18 +01:00
parent 2b8146f72d 4e74dbf218
commit 5739049f90
7 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Umbraco.Tests.AcceptanceTest/package.json
View File

@@ -27,4 +27,4 @@
"dotenv": "^16.3.1",
"node-fetch": "^2.6.7"
}
}
}

3
tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts
View File

@@ -106,7 +106,8 @@ test('can copy and paste a single block into the same document but different gro
await umbracoUi.content.doesBlockEditorBlockWithNameContainValue(elementGroupName, elementPropertyName, ConstantHelper.inputTypes.tipTap, blockPropertyValue);
});
test('can copy and paste a single block into another document', async ({umbracoApi, umbracoUi}) => {
// Remove skip after this issue is resolved: https://github.com/umbraco/Umbraco-CMS/issues/20680
test.skip('can copy and paste a single block into another document', async ({umbracoApi, umbracoUi}) => {
// Arrange
await umbracoApi.document.ensureNameNotExists(secondContentName);
await umbracoApi.document.createDefaultDocumentWithABlockGridEditorAndBlockWithValue(contentName, documentTypeName, blockGridDataTypeName, elementTypeId, AliasHelper.toAlias(elementPropertyName), blockPropertyValue, richTextDataTypeUiAlias);

3
tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockListBlocks.spec.ts
View File

@@ -106,7 +106,8 @@ test('can copy and paste a single block into the same document but different gro
await umbracoUi.content.doesBlockEditorBlockWithNameContainValue(elementGroupName, elementPropertyName, ConstantHelper.inputTypes.tipTap, blockPropertyValue);
});
test('can copy and paste a single block into another document', async ({umbracoApi, umbracoUi}) => {
// Remove skip after this issue is resolved: https://github.com/umbraco/Umbraco-CMS/issues/20680
test.skip('can copy and paste a single block into another document', async ({umbracoApi, umbracoUi}) => {
// Arrange
await umbracoApi.document.ensureNameNotExists(secondContentName);
await umbracoApi.document.createDefaultDocumentWithABlockListEditorAndBlockWithValue(contentName, documentTypeName, blockListDataTypeName, elementTypeId, AliasHelper.toAlias(elementPropertyName), blockPropertyValue, elementDataTypeUiAlias, groupName);

4
tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Webhook/Webhook.spec.ts
View File

@@ -14,7 +14,7 @@ test.afterEach(async ({umbracoApi}) => {
await umbracoApi.webhook.ensureNameNotExists(webhookName);
});
test('can create a webhook', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
test('can create a webhook', async ({umbracoApi, umbracoUi}) => {
// Arrange
const event = 'Content Deleted';
const webhookSiteUrl = umbracoApi.webhook.webhookSiteUrl + webhookSiteToken;
@@ -122,7 +122,7 @@ test('can disable a webhook', async ({umbracoApi, umbracoUi}) => {
await umbracoApi.webhook.isWebhookEnabled(webhookName, false);
});
test('cannot remove all events from a webhook', {tag: '@release'}, async ({umbracoApi, umbracoUi}) => {
test('cannot remove all events from a webhook', async ({umbracoApi, umbracoUi}) => {
// Arrange
const event = 'Content Deleted';
await umbracoApi.webhook.createDefaultWebhook(webhookName, webhookSiteToken, event);