Skip to content

Commit 1e929fa

Browse files
anthoulaanthoula
committed
MC-3723: Advanced properties saving when invalid value is specified
- unskip test - update test to check for valid border-radius values
1 parent e674a15 commit 1e929fa

File tree

1 file changed

+30
-160
lines changed

1 file changed

+30
-160
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest.xml

Lines changed: 30 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,9 +1114,9 @@
11141114
<argument name="containerTargetIndex" value="1"/>
11151115
<argument name="contentTypeIndex" value="1"/>
11161116
</actionGroup>
1117+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
11171118
<!-- Add Invalid Border Width: NonNumeric -->
11181119
<comment userInput="Add Border Width: NonNumeric" stepKey="commentAddBorderWidthNonNumeric"/>
1119-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
11201120
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
11211121
<argument name="contentType" value="PageBuilderTextContentType"/>
11221122
<argument name="contentTypeIndex" value="1"/>
@@ -1381,9 +1381,6 @@
13811381
<testCaseId value="MC-2885"/>
13821382
<group value="pagebuilder"/>
13831383
<group value="pagebuilder-advancedConfig"/>
1384-
<skip>
1385-
<issueId value="MC-3723"/>
1386-
</skip>
13871384
</annotations>
13881385
<before>
13891386
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -1396,31 +1393,26 @@
13961393
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
13971394
<argument name="contentType" value="PageBuilderTextContentType"/>
13981395
</actionGroup>
1399-
<!-- Add A Row For Each Text Border Radius Test -->
1400-
<comment userInput="Add Rows" stepKey="commentAddRows"/>
1401-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage1">
1402-
<argument name="contentType" value="PageBuilderRowContentType"/>
1403-
</actionGroup>
1404-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage2">
1405-
<argument name="contentType" value="PageBuilderRowContentType"/>
1406-
</actionGroup>
1407-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage3">
1408-
<argument name="contentType" value="PageBuilderRowContentType"/>
1409-
</actionGroup>
1410-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage4">
1411-
<argument name="contentType" value="PageBuilderRowContentType"/>
1412-
</actionGroup>
1413-
<!-- Add Border Radius: Empty -->
1414-
<comment userInput="Add Border Radius: Empty" stepKey="commentAddBorderRadiusEmpty"/>
14151396
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
14161397
<argument name="group" value="PageBuilderTextContentType"/>
14171398
</actionGroup>
1418-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
1399+
<!-- Add Text to Stage -->
1400+
<comment userInput="Add Text to Stage" stepKey="commentAddTextToStage"/>
1401+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage">
1402+
<argument name="contentType" value="PageBuilderTextContentType"/>
1403+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1404+
<argument name="containerTargetIndex" value="1"/>
1405+
<argument name="contentTypeIndex" value="1"/>
1406+
</actionGroup>
1407+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage2">
14191408
<argument name="contentType" value="PageBuilderTextContentType"/>
14201409
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
14211410
<argument name="containerTargetIndex" value="1"/>
14221411
<argument name="contentTypeIndex" value="1"/>
14231412
</actionGroup>
1413+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
1414+
<!-- Add Border Radius: Empty -->
1415+
<comment userInput="Add Border Radius: Empty" stepKey="commentAddBorderRadiusEmpty"/>
14241416
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage1">
14251417
<argument name="contentType" value="PageBuilderTextContentType"/>
14261418
<argument name="contentTypeIndex" value="1"/>
@@ -1432,14 +1424,9 @@
14321424
<argument name="property" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
14331425
</actionGroup>
14341426
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
1435-
<!-- Add Border Radius: 0 -->
1436-
<comment userInput="Add Border Radius: 0" stepKey="commentAddBorderRadius0"/>
1437-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage2">
1438-
<argument name="contentType" value="PageBuilderTextContentType"/>
1439-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1440-
<argument name="containerTargetIndex" value="2"/>
1441-
<argument name="contentTypeIndex" value="2"/>
1442-
</actionGroup>
1427+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor2"/>
1428+
<!-- Add Border Radius: 12 -->
1429+
<comment userInput="Add Border Radius: 12" stepKey="commentAddBorderRadius12"/>
14431430
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage2">
14441431
<argument name="contentType" value="PageBuilderTextContentType"/>
14451432
<argument name="contentTypeIndex" value="2"/>
@@ -1448,99 +1435,22 @@
14481435
<argument name="property" value="PageBuilderTextProperty"/>
14491436
</actionGroup>
14501437
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderRadius2">
1451-
<argument name="property" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
1438+
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty12"/>
14521439
</actionGroup>
14531440
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
1454-
<!-- Add Border Radius: 1 -->
1455-
<comment userInput="Add Border Radius: 1" stepKey="commentAddBorderRadius1"/>
1456-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage3">
1457-
<argument name="contentType" value="PageBuilderTextContentType"/>
1458-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1459-
<argument name="containerTargetIndex" value="3"/>
1460-
<argument name="contentTypeIndex" value="3"/>
1461-
</actionGroup>
1462-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage3">
1463-
<argument name="contentType" value="PageBuilderTextContentType"/>
1464-
<argument name="contentTypeIndex" value="3"/>
1465-
</actionGroup>
1466-
<actionGroup ref="addTextToTinyMCE" stepKey="enterText3">
1467-
<argument name="property" value="PageBuilderTextProperty"/>
1468-
</actionGroup>
1469-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderRadius3">
1470-
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty1"/>
1471-
</actionGroup>
1472-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
1473-
<!-- Add Border Radius: 500 -->
1474-
<comment userInput="Add Border Radius: 1" stepKey="commentAddBorderRadius500"/>
1475-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage4">
1476-
<argument name="contentType" value="PageBuilderTextContentType"/>
1477-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1478-
<argument name="containerTargetIndex" value="4"/>
1479-
<argument name="contentTypeIndex" value="4"/>
1480-
</actionGroup>
1481-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage4">
1482-
<argument name="contentType" value="PageBuilderTextContentType"/>
1483-
<argument name="contentTypeIndex" value="4"/>
1484-
</actionGroup>
1485-
<actionGroup ref="addTextToTinyMCE" stepKey="enterText4">
1486-
<argument name="property" value="PageBuilderTextProperty"/>
1487-
</actionGroup>
1488-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderRadius4">
1489-
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty500"/>
1490-
</actionGroup>
1491-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings4"/>
1492-
<!-- Add Border Radius: Invalid -->
1493-
<comment userInput="Add Border Radius: Invalid" stepKey="commentAddBorderRadiusInvalid"/>
1494-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage5">
1495-
<argument name="contentType" value="PageBuilderTextContentType"/>
1496-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1497-
<argument name="containerTargetIndex" value="5"/>
1498-
<argument name="contentTypeIndex" value="5"/>
1499-
</actionGroup>
1500-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage5">
1501-
<argument name="contentType" value="PageBuilderTextContentType"/>
1502-
<argument name="contentTypeIndex" value="5"/>
1503-
</actionGroup>
1504-
<actionGroup ref="addTextToTinyMCE" stepKey="enterText5">
1505-
<argument name="property" value="PageBuilderTextProperty"/>
1506-
</actionGroup>
1507-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderRadius5">
1508-
<argument name="property" value="PageBuilderAdvancedBorderRadiusPropertyInvalid"/>
1509-
</actionGroup>
1510-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings5"/>
1511-
<!-- Stage: Check Border Radius: Empty -->
1441+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor3"/>
15121442
<comment userInput="Stage: Check Border Radius: Empty" stepKey="commentStageCheckEmpty"/>
15131443
<actionGroup ref="validateAdvancedStyleWithNoAlignmentEmptyBorderRadius" stepKey="validateStageEmpty">
15141444
<argument name="page" value="TextOnStage"/>
15151445
<argument name="index" value="1"/>
15161446
</actionGroup>
1517-
<!-- Stage: Check Border Radius: 0 -->
1518-
<comment userInput="Stage: Check Border Radius: 0" stepKey="commentStageCheck0"/>
1519-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage0">
1447+
<!-- Stage: Check Border Radius: 12 -->
1448+
<comment userInput="Stage: Check Border Radius: 12" stepKey="commentStageCheck12"/>
1449+
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage12">
15201450
<argument name="page" value="TextOnStage"/>
1521-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
1451+
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
15221452
<argument name="index" value="2"/>
15231453
</actionGroup>
1524-
<!-- Stage: Check Border Radius: 1 -->
1525-
<comment userInput="Stage: Check Border Radius: 1" stepKey="commentStageCheck1"/>
1526-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage1">
1527-
<argument name="page" value="TextOnStage"/>
1528-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty1"/>
1529-
<argument name="index" value="3"/>
1530-
</actionGroup>
1531-
<!-- Stage: Check Border Radius: 500 -->
1532-
<comment userInput="Stage: Check Border Radius: 500" stepKey="commentStageCheck500"/>
1533-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage500">
1534-
<argument name="page" value="TextOnStage"/>
1535-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty500"/>
1536-
<argument name="index" value="4"/>
1537-
</actionGroup>
1538-
<!-- Stage: Check Border Radius: Invalid -->
1539-
<comment userInput="Stage: Check Border Radius: Invalid" stepKey="commentStageCheckInvalid"/>
1540-
<actionGroup ref="validateAdvancedStyleWithNoBorderRadius" stepKey="validateStageInvalid">
1541-
<argument name="page" value="TextOnStage"/>
1542-
<argument name="index" value="5"/>
1543-
</actionGroup>
15441454
<comment userInput="Validate Stage After Save" stepKey="commentStageAfterSave"/>
15451455
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
15461456
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -1550,33 +1460,13 @@
15501460
<argument name="page" value="TextOnStage"/>
15511461
<argument name="index" value="1"/>
15521462
</actionGroup>
1553-
<!-- Stage: Check Border Radius: 0 -->
1554-
<comment userInput="Stage: Check Border Radius: 0" stepKey="commentStageCheck02"/>
1555-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage02">
1463+
<!-- Stage: Check Border Radius: 12 -->
1464+
<comment userInput="Stage: Check Border Radius: 12" stepKey="commentStageCheck12AfterSave"/>
1465+
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage12AfterSave">
15561466
<argument name="page" value="TextOnStage"/>
1557-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
1467+
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
15581468
<argument name="index" value="2"/>
15591469
</actionGroup>
1560-
<!-- Stage: Check Border Radius: 1 -->
1561-
<comment userInput="Stage: Check Border Radius: 1" stepKey="commentStageCheck12"/>
1562-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage12">
1563-
<argument name="page" value="TextOnStage"/>
1564-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty1"/>
1565-
<argument name="index" value="3"/>
1566-
</actionGroup>
1567-
<!-- Stage: Check Border Radius: 500 -->
1568-
<comment userInput="Stage: Check Border Radius: 500" stepKey="commentStageCheck5002"/>
1569-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage5002">
1570-
<argument name="page" value="TextOnStage"/>
1571-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty500"/>
1572-
<argument name="index" value="4"/>
1573-
</actionGroup>
1574-
<!-- Stage: Check Border Radius: Invalid -->
1575-
<comment userInput="Stage: Check Border Radius: Invalid" stepKey="commentStageCheckInvalid2"/>
1576-
<actionGroup ref="validateAdvancedStyleWithNoBorderRadius" stepKey="validateStageInvalid2">
1577-
<argument name="page" value="TextOnStage"/>
1578-
<argument name="index" value="5"/>
1579-
</actionGroup>
15801470
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
15811471
<argument name="contentType" value="PageBuilderTextContentType"/>
15821472
</actionGroup>
@@ -1586,33 +1476,13 @@
15861476
<argument name="page" value="TextOnStorefront"/>
15871477
<argument name="index" value="1"/>
15881478
</actionGroup>
1589-
<!-- Storefront: Check Border Radius: 0 -->
1590-
<comment userInput="Storefront: Check Border Radius: 0" stepKey="commentStorefrontCheck0"/>
1591-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefront0">
1479+
<!-- Storefront: Check Border Radius: 12 -->
1480+
<comment userInput="Storefront: Check Border Radius: 12" stepKey="commentStorefrontCheck12"/>
1481+
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefront12">
15921482
<argument name="page" value="TextOnStorefront"/>
1593-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
1483+
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
15941484
<argument name="index" value="2"/>
15951485
</actionGroup>
1596-
<!-- Storefront: Check Border Radius: 1 -->
1597-
<comment userInput="Storefront: Check Border Radius: 1" stepKey="commentStorefrontCheck1"/>
1598-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefront1">
1599-
<argument name="page" value="TextOnStorefront"/>
1600-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty1"/>
1601-
<argument name="index" value="3"/>
1602-
</actionGroup>
1603-
<!-- Storefront: Check Border Radius: 500 -->
1604-
<comment userInput="Storefront: Check Border Radius: 500" stepKey="commentStorefrontCheck500"/>
1605-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefront500">
1606-
<argument name="page" value="TextOnStorefront"/>
1607-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty500"/>
1608-
<argument name="index" value="4"/>
1609-
</actionGroup>
1610-
<!-- Storefront: Check Border Radius: Invalid -->
1611-
<comment userInput="Storefront: Check Border Radius: Invalid" stepKey="commentStorefrontCheckInvalid"/>
1612-
<actionGroup ref="validateAdvancedStyleWithNoBorderRadius" stepKey="validateStorefrontInvalid">
1613-
<argument name="page" value="TextOnStorefront"/>
1614-
<argument name="index" value="5"/>
1615-
</actionGroup>
16161486
</test>
16171487
<test name="AdvancedConfigurationFunctionalCSSClasses">
16181488
<annotations>

0 commit comments

Comments
 (0)