Skip to content

Commit 87db6f8

Browse files
author
hannahnida
committed
Merge branch '558_7_content-type-style-attribute-removal' of github:hannahnida/magento2-page-builder into 558_7_content-type-style-attribute-removal
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderActionGroup.xml
2 parents 2290758 + 0372e44 commit 87db6f8

File tree

30 files changed

+215
-317
lines changed

30 files changed

+215
-317
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="ValidateAdvancedConfigurationAllOptionsActionGroup">
1111
<annotations>
12-
<description value="You should be to make static checks of values."/>
12+
<description value="You should be to make static checks of values."/>
1313
</annotations>
1414
<arguments>
1515
<argument name="page" defaultValue=""/>
16-
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault"/>
17-
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
16+
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault.value"/>
17+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone.value"/>
1818
<argument name="borderColor" defaultValue=""/>
19-
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
20-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
19+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault.value"/>
20+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty.value"/>
2121
<argument name="cssClasses" defaultValue=""/>
22-
<argument name="margin" defaultValue="PageBuilderMarginsPropertyDefault"/>
23-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
22+
<argument name="margin" defaultValue="PageBuilderMarginsPropertyDefault.value"/>
23+
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault.value"/>
2424
<argument name="index" defaultValue="1" type="string"/>
2525
</arguments>
2626
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>
2727
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).textAlign" stepKey="grabAlignmentValue"/>
2828
<assertEquals stepKey="assertAlignment">
29-
<expectedResult type="string">{{alignment.value}}</expectedResult>
29+
<expectedResult type="string">{{alignment}}</expectedResult>
3030
<actualResult type="variable">grabAlignmentValue</actualResult>
3131
</assertEquals>
3232
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderStyle" stepKey="grabBorderStyleValue"/>
3333
<assertEquals stepKey="assertBorderStyle">
34-
<expectedResult type="string">{{border.value}}</expectedResult>
34+
<expectedResult type="string">{{border}}</expectedResult>
3535
<actualResult type="variable">grabBorderStyleValue</actualResult>
3636
</assertEquals>
3737
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderColor" stepKey="grabBorderColorValue"/>
@@ -41,23 +41,23 @@
4141
</assertEquals>
4242
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderWidth.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderWidthValue"/>
4343
<assertEquals stepKey="assertBorderWidth">
44-
<expectedResult type="string">{{borderWidth.value}}</expectedResult>
44+
<expectedResult type="string">{{borderWidth}}</expectedResult>
4545
<actualResult type="variable">grabBorderWidthValue</actualResult>
4646
</assertEquals>
4747
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderRadius.replace(/px/g, &quot;&quot;)" stepKey="grabBorderRadiusValue"/>
4848
<assertEquals stepKey="assertBorderRadius">
49-
<expectedResult type="string">{{borderRadius.value}}</expectedResult>
49+
<expectedResult type="string">{{borderRadius}}</expectedResult>
5050
<actualResult type="variable">grabBorderRadiusValue</actualResult>
5151
</assertEquals>
5252
<waitForElementVisible selector="{{page.cssClasses(index, cssClasses.value)}}" stepKey="waitForCSSClassesVisible"/>
5353
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).margin.replace(/px/g, &quot;&quot;)" stepKey="grabMarginValue"/>
5454
<assertEquals stepKey="assertMargin">
55-
<expectedResult type="string">{{margin.value}}</expectedResult>
55+
<expectedResult type="string">{{margin}}</expectedResult>
5656
<actualResult type="variable">grabMarginValue</actualResult>
5757
</assertEquals>
5858
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).padding.replace(/px/g, &quot;&quot;)" stepKey="grabPaddingValue"/>
5959
<assertEquals stepKey="assertPadding">
60-
<expectedResult type="string">{{padding.value}}</expectedResult>
60+
<expectedResult type="string">{{padding}}</expectedResult>
6161
<actualResult type="variable">grabPaddingValue</actualResult>
6262
</assertEquals>
6363
</actionGroup>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup">
1111
<annotations>
12-
<description value="Validate updated values with default values."/>
12+
<description value="Validate updated values with default values."/>
1313
</annotations>
1414
<arguments>
1515
<argument name="page" defaultValue=""/>
16-
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
17-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
18-
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
19-
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyStart"/>
16+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone.value"/>
17+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty.value"/>
18+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0.value"/>
19+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyStart.value"/>
2020
<argument name="defaultMargin" defaultValue="0" type="string"/>
2121
<argument name="defaultPadding" defaultValue="0" type="string"/>
2222
<argument name="cssClasses" defaultValue=""/>
@@ -26,12 +26,12 @@
2626
<dontSeeElement selector="{{page.base(index)}}" stepKey="dontSeeElement"/>
2727
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).textAlign" stepKey="grabAlignmentValue"/>
2828
<assertEquals stepKey="assertDefaultAlignmentVisible">
29-
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
29+
<expectedResult type="string">{{defaultAlignment}}</expectedResult>
3030
<actualResult type="variable">grabAlignmentValue</actualResult>
3131
</assertEquals>
3232
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderStyle" stepKey="grabBorderStyleValue"/>
3333
<assertEquals stepKey="assertNoBorderStyle">
34-
<expectedResult type="string">{{border.value}}</expectedResult>
34+
<expectedResult type="string">{{border}}</expectedResult>
3535
<actualResult type="variable">grabBorderStyleValue</actualResult>
3636
</assertEquals>
3737
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderColor" stepKey="grabBorderColorValue"/>
@@ -42,12 +42,12 @@
4242
</assertEquals>
4343
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderWidth.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderWidthValue"/>
4444
<assertEquals stepKey="assertNoBorderWidth">
45-
<expectedResult type="string">{{borderWidth.value}}</expectedResult>
45+
<expectedResult type="string">{{borderWidth}}</expectedResult>
4646
<actualResult type="variable">grabBorderWidthValue</actualResult>
4747
</assertEquals>
4848
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderRadius.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderRadiusValue"/>
4949
<assertEquals stepKey="assertNoBorderRadius">
50-
<expectedResult type="string">{{borderRadius.value}}</expectedResult>
50+
<expectedResult type="string">{{borderRadius}}</expectedResult>
5151
<actualResult type="variable">grabBorderRadiusValue</actualResult>
5252
</assertEquals>
5353
<waitForElement selector="{{page.cssClasses(index, cssClasses.value)}}" stepKey="waitForCSSClasses"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="ValidateAdvancedConfigurationWithBorderColorActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
1111
<annotations>
12-
<description value="Validate Border color value."/>
12+
<description value="Validate Border color value."/>
1313
</annotations>
1414
<arguments>
15-
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
15+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft.value"/>
1616
</arguments>
1717
<remove keyForRemoval="assertAlignment"/>
1818
<assertEquals stepKey="assertDefaultAlignment" after="grabAlignmentValue">
19-
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
19+
<expectedResult type="string">{{defaultAlignment}}</expectedResult>
2020
<actualResult type="variable">grabAlignmentValue</actualResult>
2121
</assertEquals>
2222
<remove keyForRemoval="waitForCSSClassesVisible"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="ValidateAdvancedConfigurationWithCssClassesActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
1111
<annotations>
12-
<description value="Validate Css classes property."/>
12+
<description value="Validate Css classes property."/>
1313
</annotations>
1414
<arguments>
15-
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
16-
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
15+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft.value"/>
16+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0.value"/>
1717
<argument name="cssClasses" defaultValue="PageBuilderAdvancedCssClassesProperty_Empty"/>
1818
</arguments>
1919
<remove keyForRemoval="assertAlignment"/>
2020
<assertEquals stepKey="assertDefaultAlignmentVisible" after="grabAlignmentValue">
21-
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
21+
<expectedResult type="string">{{defaultAlignment}}</expectedResult>
2222
<actualResult type="variable">grabAlignmentValue</actualResult>
2323
</assertEquals>
2424
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).color" stepKey="grabColorValue" after="grabBorderColorValue"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
1111
<annotations>
12-
<description value="Validate all options without alignment property."/>
12+
<description value="Validate all options without alignment property."/>
1313
</annotations>
1414
<arguments>
15-
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
16-
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
15+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft.value"/>
16+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0.value"/>
1717
</arguments>
1818
<remove keyForRemoval="assertAlignment"/>
1919
<assertEquals stepKey="assertDefaultAlignmentVisible" after="grabAlignmentValue">
20-
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
20+
<expectedResult type="string">{{defaultAlignment}}</expectedResult>
2121
<actualResult type="variable">grabAlignmentValue</actualResult>
2222
</assertEquals>
2323
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).color" stepKey="grabColorValue" after="grabBorderColorValue"/>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="ValidateAdvancedConfigurationWithNoAlignmentNotVisibleActionGroup">
1111
<annotations>
12-
<description value="Validate all options without alignment property and not visible."/>
12+
<description value="Validate all options without alignment property and not visible."/>
1313
</annotations>
1414
<arguments>
1515
<argument name="page" defaultValue=""/>
16-
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
17-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
18-
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
19-
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyStart"/>
16+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone.value"/>
17+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty.value"/>
18+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0.value"/>
19+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyStart.value"/>
2020
<argument name="defaultMargin" defaultValue="0" type="string"/>
2121
<argument name="defaultPadding" defaultValue="0" type="string"/>
2222
<argument name="index" defaultValue="1" type="string"/>
@@ -25,12 +25,12 @@
2525
<dontSeeElement selector="{{page.base(index)}}" stepKey="dontSeeElement"/>
2626
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).textAlign" stepKey="grabAlignmentValue"/>
2727
<assertEquals stepKey="assertDefaultAlignmentVisible">
28-
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
28+
<expectedResult type="string">{{defaultAlignment}}</expectedResult>
2929
<actualResult type="variable">grabAlignmentValue</actualResult>
3030
</assertEquals>
3131
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderStyle" stepKey="grabBorderStyleValue"/>
3232
<assertEquals stepKey="assertNoBorderStyle">
33-
<expectedResult type="string">{{border.value}}</expectedResult>
33+
<expectedResult type="string">{{border}}</expectedResult>
3434
<actualResult type="variable">grabBorderStyleValue</actualResult>
3535
</assertEquals>
3636
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderColor" stepKey="grabBorderColorValue"/>
@@ -41,12 +41,12 @@
4141
</assertEquals>
4242
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderWidth.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderWidthValue"/>
4343
<assertEquals stepKey="assertNoBorderWidth">
44-
<expectedResult type="string">{{borderWidth.value}}</expectedResult>
44+
<expectedResult type="string">{{borderWidth}}</expectedResult>
4545
<actualResult type="variable">grabBorderWidthValue</actualResult>
4646
</assertEquals>
4747
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderRadius.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderRadiusValue"/>
4848
<assertEquals stepKey="assertNoBorderRadius">
49-
<expectedResult type="string">{{borderRadius.value}}</expectedResult>
49+
<expectedResult type="string">{{borderRadius}}</expectedResult>
5050
<actualResult type="variable">grabBorderRadiusValue</actualResult>
5151
</assertEquals>
5252
<waitForElement selector="{{page.noCssClasses(index)}}" stepKey="waitForCSSClasses"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="ValidateAdvancedConfigurationWithNoBorderActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
1111
<annotations>
12-
<description value="Validate options without border style value."/>
12+
<description value="Validate options without border style value."/>
1313
</annotations>
1414
<arguments>
15-
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
15+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft.value"/>
1616
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1717
</arguments>
1818
<remove keyForRemoval="assertAlignment"/>
1919
<assertEquals stepKey="assertDefaultAlignment" after="grabAlignmentValue">
20-
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
20+
<expectedResult type="string">{{defaultAlignment}}</expectedResult>
2121
<actualResult type="variable">grabAlignmentValue</actualResult>
2222
</assertEquals>
2323
<remove keyForRemoval="assertBorderStyle"/>

0 commit comments

Comments
 (0)