Skip to content

Commit 27ed05d

Browse files
author
hannahnida
committed
#558: Developer can style content types output differently per viewport - Action Groups changes
1 parent 98ffb69 commit 27ed05d

21 files changed

+63
-71
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAlignmentActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="ValidateAdvancedStyleWithAlignmentActionGroup" deprecated="Styles are not inline. Use ValidateAdvancedConfigurationWithAlignmentActionGroup instead.">
10+
<actionGroup name="validateAdvancedStyleWithAlignment" deprecated="Styles are not inline, use ValidateAdvancedConfigurationWithAlignmentActionGroup instead">
1111
<arguments>
1212
<argument name="page" defaultValue=""/>
1313
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsDefaultMarginActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
4+
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
77
-->
@@ -12,6 +12,7 @@
1212
<argument name="buttonItemPage"/>
1313
<argument name="buttonIndex" defaultValue="1" type="string"/>
1414
</arguments>
15+
<comment userInput="Validate default margin" stepKey="comment"/>
1516
<executeJS function="return window.getComputedStyle({{buttonItemPage.jsButtonSelector(buttonIndex)}}).margin.replace(/px/g, &quot;&quot;)" stepKey="getDefaultMarginValueStage"/>
1617
<assertEquals stepKey="checkDefaultMarginValueStage">
1718
<expectedResult type="string">{{PageBuilderMarginsPropertyButtonItemDefault.value}}</expectedResult>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWidthPercentageActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
910
<actionGroup name="validateDividerWidthPercentage">
1011
<arguments>
1112
<argument name="page"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationActionGroup.xml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
7-
-->
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="verifyHeadingDefaultAdvancedConfiguration" deprecated="Styles are not inline. use VerifyHeadingDefaultAdvancedConfigurationVisibleActionGroup instead.">
11-
<arguments>
12-
<argument name="page" defaultValue=""/>
13-
<argument name="headingType" defaultValue="PageBuilderHeadingTypeDefaultProperty"/>
14-
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
15-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
16-
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
17-
<argument name="index" defaultValue="1" type="string"/>
18-
</arguments>
19-
<waitForElementVisible selector="{{page.baseByTagName(headingType.value, index)}}" stepKey="waitForElementVisible"/>
20-
<waitForElementVisible selector="{{page.noAlignment(headingType.value, index)}}" stepKey="waitForAlignmentVisible"/>
21-
<waitForElementVisible selector="{{page.border(headingType.value, index, border.value)}}" stepKey="waitForBorderVisible"/>
22-
<waitForElementVisible selector="{{page.noBorderColor(headingType.value, index)}}" stepKey="waitForBorderColorVisible"/>
23-
<waitForElementVisible selector="{{page.borderWidth(headingType.value, index, borderWidth.value)}}" stepKey="waitForBorderWidthVisible"/>
24-
<waitForElementVisible selector="{{page.borderRadius(headingType.value, index, borderRadius.value)}}" stepKey="waitForBorderRadiusVisible"/>
25-
<waitForElementVisible selector="{{page.noCssClasses(headingType.value, index)}}" stepKey="waitForCSSClassesVisible"/>
26-
<waitForElementVisible selector="{{page.noMargins(headingType.value, index)}}" stepKey="waitForMarginVisible"/>
27-
<waitForElementVisible selector="{{page.noPadding(headingType.value, index)}}" stepKey="waitForPaddingVisible"/>
28-
</actionGroup>
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="verifyHeadingDefaultAdvancedConfiguration" deprecated="Styles are not inline, use VerifyHeadingDefaultAdvancedConfigurationVisibleActionGroup instead">
11+
<arguments>
12+
<argument name="page" defaultValue=""/>
13+
<argument name="headingType" defaultValue="PageBuilderHeadingTypeDefaultProperty"/>
14+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
15+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
16+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
17+
<argument name="index" defaultValue="1" type="string"/>
18+
</arguments>
19+
<waitForElementVisible selector="{{page.baseByTagName(headingType.value, index)}}" stepKey="waitForElementVisible"/>
20+
<waitForElementVisible selector="{{page.noAlignment(headingType.value, index)}}" stepKey="waitForAlignmentVisible"/>
21+
<waitForElementVisible selector="{{page.border(headingType.value, index, border.value)}}" stepKey="waitForBorderVisible"/>
22+
<waitForElementVisible selector="{{page.noBorderColor(headingType.value, index)}}" stepKey="waitForBorderColorVisible"/>
23+
<waitForElementVisible selector="{{page.borderWidth(headingType.value, index, borderWidth.value)}}" stepKey="waitForBorderWidthVisible"/>
24+
<waitForElementVisible selector="{{page.borderRadius(headingType.value, index, borderRadius.value)}}" stepKey="waitForBorderRadiusVisible"/>
25+
<waitForElementVisible selector="{{page.noCssClasses(headingType.value, index)}}" stepKey="waitForCSSClassesVisible"/>
26+
<waitForElementVisible selector="{{page.noMargins(headingType.value, index)}}" stepKey="waitForMarginVisible"/>
27+
<waitForElementVisible selector="{{page.noPadding(headingType.value, index)}}" stepKey="waitForPaddingVisible"/>
28+
</actionGroup>
2929
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStageWithAlignmentActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
4+
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
77
-->

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithAllUpdatedMapWithErrorOverlayActionGroup.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="ValidateAdvancedStyleWithAllUpdatedMapWithErrorOverlayActionGroup" extends="validateAdvancedStyleWithAllUpdatedNotVisible" deprecated="Styles are not inline. Use ValidateAdvancedConfigurationWithAllUpdatedMapWithErrorOverlayActionGroup instead">
11-
<annotations>
12-
<description>Validates Map styles with error overlay</description>
13-
</annotations>
10+
<actionGroup name="validateAdvancedStyleWithAllUpdatedMapWithErrorOverlay" extends="validateAdvancedStyleWithAllUpdatedNotVisible" deprecated="Styles are not inline, use ValidateAdvancedConfigurationWithAllUpdatedMapWithErrorOverlayActionGroup instead">
1411
<waitForElementVisible selector="{{page.warningMessageLink(index)}}" stepKey="dontSeeElement"/>
1512
</actionGroup>
1613
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithNoAlignmentMapWithErrorOverlayActionGroup.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="ValidateAdvancedStyleWithNoAlignmentMapWithErrorOverlayActionGroup" extends="validateAdvancedStyleWithNoAlignmentNotVisible" deprecated="Styles not inline. Use ValidateAdvancedConfigurationWithNoAlignmentMapWithErrorOverlayActionGroup instead">
11-
<annotations>
12-
<description>Validates Map styles with error overlay (excl. alignment)</description>
13-
</annotations>
10+
<actionGroup name="validateAdvancedStyleWithNoAlignmentMapWithErrorOverlay" extends="validateAdvancedStyleWithNoAlignmentNotVisible" deprecated="Styles not inline, use ValidateAdvancedConfigurationWithNoAlignmentMapWithErrorOverlayActionGroup instead">
1411
<waitForElementVisible selector="{{page.warningMessageLink(index)}}" stepKey="dontSeeElement"/>
1512
</actionGroup>
1613
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="ValidateMapSettingsActionGroup" deprecated="Styles are not inline, use ValidateMapGeneralConfigurationActionGroup">
10+
<actionGroup name="validateMapSettings" deprecated="Styles are not inline, use ValidateMapGeneralConfigurationActionGroup">
1111
<arguments>
1212
<argument name="page"/>
1313
<argument name="height" defaultValue="PageBuilderMapHeightDefaultProperty"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsWithErrorOverlayActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="ValidateMapSettingsWithErrorOverlayActionGroup" deprecated="Styles not inline, use ValidateMapGeneralConfigurationWithErrorOverlayActionGroup">
10+
<actionGroup name="validateMapSettingsWithErrorOverlay" deprecated="Styles not inline, use ValidateMapGeneralConfigurationWithErrorOverlayActionGroup instead">
1111
<arguments>
1212
<argument name="page"/>
1313
<argument name="height" defaultValue="PageBuilderMapHeightDefaultProperty"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateBackgroundAttributesForSlideActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="ValidateBackgroundAttributesForSlideActionGroup" extends="ValidateAllBackgroundAttributesActionGroup">
10+
<actionGroup name="ValidateBackgroundAttributesForSlide" extends="ValidateAllBackgroundAttributesActionGroup">
1111
<annotations>
12-
<description>Validates background attributes for slide</description>
12+
<description>Validates Background Attributes for Slide</description>
1313
</annotations>
1414
<remove keyForRemoval="waitForBackgroundAttachment"/>
1515
</actionGroup>

0 commit comments

Comments
 (0)