Skip to content

Commit c6866e0

Browse files
author
hannahnida
committed
Merge branch '558_7_content-type-style-attribute-removal' of hannahnida/magento2-page-builder into 558_7_content-type-style-attribute-removal
2 parents 5b0016c + 96d00fc commit c6866e0

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup">
1111
<annotations>
12-
<description>Validate style is not visible</description>
12+
<description>Content types expected style does not equal the computed style</description>
1313
</annotations>
1414
<arguments>
1515
<argument name="selector" defaultValue="" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleEqualsExpectedStyleActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
99
<actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
1010
<annotations>
11-
<description>Validate styles</description>
11+
<description>Content types expected style equals the computed style</description>
1212
</annotations>
1313
<arguments>
1414
<argument name="selector" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStorefrontSection.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="BlockOnStorefront">
11-
<element name="ancestor" type="text" selector="[ancestor::div[@data-content-type='block']]"/>
12-
<element name="ancestorPath" type="text" selector="[ancestor::div[@data-content-type=&quot;block&quot;]]"/>
11+
<element name="ancestor" type="text" selector="[ancestor::div[@data-content-type=&quot;block&quot;]]"/>
1312
<element name="html" type="text" selector="(//div[@data-content-type='html'])[{{arg1}}]//a[contains(@class,'pagebuilder-button-primary')]" parameterized="true"/>
1413
<element name="base" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}]" parameterized="true"/>
1514
<element name="baseCSS" type="text" selector="[data-content-type=block]"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContentIsVerticallyAlignedTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@
7070
<!-- Verify Vertical Alignment On Stage - Before Save -->
7171
<comment userInput="Verify min height and vertical alignment on stage before save" stepKey="commentVerifyMinHeightAndVerticalAlignmentOnStageBeforeSave"/>
7272
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeRowMinHeightBeforeSave">
73-
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestorPath}})[1]"/>
73+
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestor}})[1]"/>
7474
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
7575
<argument name="cssProperty" value="minHeight"/>
7676
</actionGroup>
7777
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeRowVerticalAlignmentBottomBeforeSave">
78-
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestorPath}})[1]"/>
78+
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestor}})[1]"/>
7979
<argument name="expectedProperty" value="{{PageBuilderVerticalAlignmentPropertyBottom.value}}"/>
8080
<argument name="cssProperty" value="justifyContent"/>
8181
</actionGroup>
@@ -91,12 +91,12 @@
9191
<!-- Verify Vertical Alignment On Stage - After Save -->
9292
<comment userInput="Verify min height and vertical alignment on stage after save" stepKey="commentVerifyMinHeightAndVerticalAlignmentOnStageAfterSave"/>
9393
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeRowMinHeightAfterSave">
94-
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestorPath}})[1]"/>
94+
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestor}})[1]"/>
9595
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
9696
<argument name="cssProperty" value="minHeight"/>
9797
</actionGroup>
9898
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeRowVerticalAlignmentBottomAfterSave">
99-
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestorPath}})[1]"/>
99+
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestor}})[1]"/>
100100
<argument name="expectedProperty" value="{{PageBuilderVerticalAlignmentPropertyBottom.value}}"/>
101101
<argument name="cssProperty" value="justifyContent"/>
102102
</actionGroup>
@@ -112,12 +112,12 @@
112112
<argument name="contentType" value="PageBuilderBlockContentType"/>
113113
</actionGroup>
114114
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeRowMinHeightStorefront">
115-
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestorPath}})[1]"/>
115+
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestor}})[1]"/>
116116
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
117117
<argument name="cssProperty" value="minHeight"/>
118118
</actionGroup>
119119
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeRowVerticalAlignmentBottomStorefront">
120-
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestorPath}})[1]"/>
120+
<argument name="selector" value="({{RowOnStorefront.inner('1')}}{{BlockOnStorefront.ancestor}})[1]"/>
121121
<argument name="expectedProperty" value="{{PageBuilderVerticalAlignmentPropertyBottom.value}}"/>
122122
<argument name="cssProperty" value="justifyContent"/>
123123
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockImageIsRightAlignedTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<!-- Verify Right Alignment On Stage - Before Save -->
8888
<comment userInput="Verify right alignment on stage before save" stepKey="commentVerifyRightAlignmentOnStageBeforeSave"/>
8989
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeImageAlignmentRightBeforeSave">
90-
<argument name="selector" value="({{ImageOnStorefront.advancedConfigurationFigurePath('1')}}{{BlockOnStorefront.ancestorPath}})[1]"/>
90+
<argument name="selector" value="({{ImageOnStorefront.advancedConfigurationFigurePath('1')}}{{BlockOnStorefront.ancestor}})[1]"/>
9191
<argument name="expectedProperty" value="{{PageBuilderAdvancedAlignmentPropertyRight.value}}"/>
9292
<argument name="cssProperty" value="textAlign"/>
9393
</actionGroup>
@@ -102,7 +102,7 @@
102102
<!-- Verify Right Alignment On Stage - After Save -->
103103
<comment userInput="Verify right alignment on stage after save" stepKey="commentVerifyRightAlignmentOnStageAfterSave"/>
104104
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeImageAlignmentRightAfterSave">
105-
<argument name="selector" value="({{ImageOnStorefront.advancedConfigurationFigurePath('1')}}{{BlockOnStorefront.ancestorPath}})[1]"/>
105+
<argument name="selector" value="({{ImageOnStorefront.advancedConfigurationFigurePath('1')}}{{BlockOnStorefront.ancestor}})[1]"/>
106106
<argument name="expectedProperty" value="{{PageBuilderAdvancedAlignmentPropertyRight.value}}"/>
107107
<argument name="cssProperty" value="textAlign"/>
108108
</actionGroup>
@@ -117,7 +117,7 @@
117117
<argument name="page" value="$$createCMSPage.identifier$$"/>
118118
</actionGroup>
119119
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeImageAlignmentRightStorefront">
120-
<argument name="selector" value="({{ImageOnStorefront.advancedConfigurationFigurePath('1')}}{{BlockOnStorefront.ancestorPath}})[1]"/>
120+
<argument name="selector" value="({{ImageOnStorefront.advancedConfigurationFigurePath('1')}}{{BlockOnStorefront.ancestor}})[1]"/>
121121
<argument name="expectedProperty" value="{{PageBuilderAdvancedAlignmentPropertyRight.value}}"/>
122122
<argument name="cssProperty" value="textAlign"/>
123123
</actionGroup>

0 commit comments

Comments
 (0)