From 9936a3d2e37e37c19021e94191ea3e7b676e8310 Mon Sep 17 00:00:00 2001 From: Andreas Zerbst Date: Fri, 4 Apr 2025 12:52:29 +0200 Subject: [PATCH 1/5] Added clipboard test --- .../ClipboardBlockGridBlocks.spec.ts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts index 1bd501f5e3f5..60bb36a52e92 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts @@ -334,3 +334,29 @@ test('can not copy a block from a block grid to a block list without allowed blo // Clean await umbracoApi.documentType.ensureNameNotExists(blockListElementTypeName); }); + +test('can not copy a block from a block grid to root without allowed in root', async ({umbracoApi, umbracoUi}) => { + // Arrange + const secondElementTypeName = 'SecondElementType'; + const areaAlias = 'testArea'; + await umbracoApi.documentType.ensureNameNotExists(secondElementTypeName); + const secondElementTypeId = await umbracoApi.documentType.createEmptyElementType(secondElementTypeName); + const blockGridId = await umbracoApi.dataType.createBlockGridWithAnAreaInABlockWithAllowInAreasAndASecondBlock(blockGridDataTypeName, elementTypeId, secondElementTypeId, areaAlias, true, 'TestCreateLabel' ,12 ,1, 0 , 10, false, true); + const areaKey = await umbracoApi.dataType.getBlockGridAreaKeyFromBlock(blockGridDataTypeName, elementTypeId, areaAlias); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, blockGridDataTypeName, blockGridId, groupName); + await umbracoApi.document.createDocumentWithABlockGridEditorWithABlockThatContainsABlockInAnArea(contentName, documentTypeId, blockGridDataTypeName, elementTypeId, areaKey, secondElementTypeId, AliasHelper.toAlias(elementPropertyName), blockPropertyValue, richTextDataTypeUiAlias); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + await umbracoUi.content.goToContentWithName(contentName); + + // Act + await umbracoUi.content.clickCopyBlockGridBlockButton(groupName, blockGridDataTypeName, secondElementTypeName, 1); + await umbracoUi.content.clickActionsMenuForProperty(groupName, blockGridDataTypeName); + await umbracoUi.content.clickExactReplaceButton(); + + // Assert + await umbracoUi.content.doesClipboardContainCopiedBlocksCount(0); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(secondElementTypeId); +}); From 0e679a99657c0c820e81805ee76aa612e4c2d6cb Mon Sep 17 00:00:00 2001 From: Andreas Zerbst Date: Fri, 4 Apr 2025 12:52:43 +0200 Subject: [PATCH 2/5] Bumped version --- .../package-lock.json | 17 +++++++++-------- tests/Umbraco.Tests.AcceptanceTest/package.json | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index 3454d8ffe732..b6ee78da3aeb 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "dependencies": { "@umbraco/json-models-builders": "^2.0.31", - "@umbraco/playwright-testhelpers": "^15.0.40", + "@umbraco/playwright-testhelpers": "^15.0.44", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" @@ -58,20 +58,21 @@ } }, "node_modules/@umbraco/json-models-builders": { - "version": "2.0.31", - "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.31.tgz", - "integrity": "sha512-RGulJazaSjp6ZfHYACXUKDQuF055oXx+Kk3Q7/+PyfGZWRngT7V799Mal1vnrG7W9EDEX9Up+AP22O/alYj3Gg==", + "version": "2.0.32", + "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.32.tgz", + "integrity": "sha512-Aw7yBu8ePNxdjS7Q61j5KPFsiOS+IGCYxBX0H4KWbjXTdvL/PsB98KiqbDHHKFnp0fF1b2ffwJAI6jmvnxPBzg==", "license": "MIT", "dependencies": { "camelize": "^1.0.1" } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "15.0.40", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-15.0.40.tgz", - "integrity": "sha512-dxXCCYeUH0rlASdHHNu8gQQrhK52gxGcwb/K1BlXFsr7Z7dz1U5eYMPUiVjDVg6LNCbqmQ/tmZqoAZLU5zDzIw==", + "version": "15.0.44", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-15.0.44.tgz", + "integrity": "sha512-rbStBJG0bdVfs9pzEjAhArhcPoQbuvrUpvDJLbEMBcg54lRFH0I5nzcAimdZaY4UWh2r0i9ANfjv9E25NJxRUg==", + "license": "MIT", "dependencies": { - "@umbraco/json-models-builders": "2.0.31", + "@umbraco/json-models-builders": "2.0.32", "node-fetch": "^2.6.7" } }, diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 63aafd38134c..524acec6eb6f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@umbraco/json-models-builders": "^2.0.31", - "@umbraco/playwright-testhelpers": "^15.0.40", + "@umbraco/playwright-testhelpers": "^15.0.44", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" From c9bcb9c200374d7694cd671c28a0d733d075e8a5 Mon Sep 17 00:00:00 2001 From: Andreas Zerbst Date: Fri, 4 Apr 2025 12:54:42 +0200 Subject: [PATCH 3/5] Updated to use the name --- .../Content/Clipboard/ClipboardBlockGridBlocks.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts index 60bb36a52e92..a151c4573ef6 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Clipboard/ClipboardBlockGridBlocks.spec.ts @@ -358,5 +358,5 @@ test('can not copy a block from a block grid to root without allowed in root', a await umbracoUi.content.doesClipboardContainCopiedBlocksCount(0); // Clean - await umbracoApi.documentType.ensureNameNotExists(secondElementTypeId); + await umbracoApi.documentType.ensureNameNotExists(secondElementTypeName); }); From 15ba8eb6e634b82b3a38dc6e89dae2da98335de5 Mon Sep 17 00:00:00 2001 From: Andreas Zerbst Date: Tue, 8 Apr 2025 08:39:02 +0200 Subject: [PATCH 4/5] Run all tests on the pipeline --- tests/Umbraco.Tests.AcceptanceTest/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 524acec6eb6f..771b797d36bb 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -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\"", + "smokeTester": "npx playwright test DefaultConfig --grep \"@smoke\"", + "smokeTest": "npx playwright test DefaultConfig/Content/Clipboard", "smokeTestSqlite": "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\"" }, "devDependencies": { From 7c909585aa0fca297f82f2a62ed2bf78d7dc215e Mon Sep 17 00:00:00 2001 From: Andreas Zerbst Date: Tue, 8 Apr 2025 09:10:43 +0200 Subject: [PATCH 5/5] Reverted command --- tests/Umbraco.Tests.AcceptanceTest/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 771b797d36bb..524acec6eb6f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -9,8 +9,7 @@ "testSqlite": "npx playwright test DefaultConfig --grep-invert \"Users\"", "all": "npx playwright test", "createTest": "node createTest.js", - "smokeTester": "npx playwright test DefaultConfig --grep \"@smoke\"", - "smokeTest": "npx playwright test DefaultConfig/Content/Clipboard", + "smokeTest": "npx playwright test DefaultConfig --grep \"@smoke\"", "smokeTestSqlite": "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\"" }, "devDependencies": {