Skip to content

Commit 88e60f3

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #651 from hannahnida/558_7_content-type-style-attribute-removal
[WIP] #558 #7 Developer can style content types output differently per viewport - Fix broken tests
2 parents 4053222 + b0a71e6 commit 88e60f3

File tree

417 files changed

+9302
-3371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+9302
-3371
lines changed

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?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+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateAdvancedConfigurationAllOptionsActionGroup">
11+
<annotations>
12+
<description value="Validates styles from Advanced configuration in content type settings"/>
13+
</annotations>
14+
<arguments>
15+
<argument name="page" defaultValue=""/>
16+
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault"/>
17+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
18+
<argument name="borderColor" defaultValue=""/>
19+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
20+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
21+
<argument name="cssClasses" defaultValue=""/>
22+
<argument name="margin" defaultValue="PageBuilderMarginsPropertyDefault"/>
23+
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
24+
<argument name="index" defaultValue="1" type="string"/>
25+
</arguments>
26+
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>
27+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).textAlign" stepKey="grabAlignmentValue"/>
28+
<assertEquals stepKey="assertAlignment">
29+
<expectedResult type="string">{{alignment.value}}</expectedResult>
30+
<actualResult type="variable">grabAlignmentValue</actualResult>
31+
</assertEquals>
32+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderStyle" stepKey="grabBorderStyleValue"/>
33+
<assertEquals stepKey="assertBorderStyle">
34+
<expectedResult type="string">{{border.value}}</expectedResult>
35+
<actualResult type="variable">grabBorderStyleValue</actualResult>
36+
</assertEquals>
37+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderColor" stepKey="grabBorderColorValue"/>
38+
<assertEquals stepKey="assertBorderColor">
39+
<expectedResult type="string">{{borderColor.rgb}}</expectedResult>
40+
<actualResult type="variable">grabBorderColorValue</actualResult>
41+
</assertEquals>
42+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderWidth.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderWidthValue"/>
43+
<assertEquals stepKey="assertBorderWidth">
44+
<expectedResult type="string">{{borderWidth.value}}</expectedResult>
45+
<actualResult type="variable">grabBorderWidthValue</actualResult>
46+
</assertEquals>
47+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderRadius.replace(/px/g, &quot;&quot;)" stepKey="grabBorderRadiusValue"/>
48+
<assertEquals stepKey="assertBorderRadius">
49+
<expectedResult type="string">{{borderRadius.value}}</expectedResult>
50+
<actualResult type="variable">grabBorderRadiusValue</actualResult>
51+
</assertEquals>
52+
<waitForElementVisible selector="{{page.cssClasses(index, cssClasses.value)}}" stepKey="waitForCSSClassesVisible"/>
53+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).margin.replace(/px/g, &quot;&quot;)" stepKey="grabMarginValue"/>
54+
<assertEquals stepKey="assertMargin">
55+
<expectedResult type="string">{{margin.value}}</expectedResult>
56+
<actualResult type="variable">grabMarginValue</actualResult>
57+
</assertEquals>
58+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).padding.replace(/px/g, &quot;&quot;)" stepKey="grabPaddingValue"/>
59+
<assertEquals stepKey="assertPadding">
60+
<expectedResult type="string">{{padding.value}}</expectedResult>
61+
<actualResult type="variable">grabPaddingValue</actualResult>
62+
</assertEquals>
63+
</actionGroup>
64+
</actionGroups>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?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+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateAdvancedConfigurationNotSetActionGroup" extends="ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup">
11+
<annotations>
12+
<description value="Validates Advanced configuration was not set"/>
13+
</annotations>
14+
<waitForElementVisible selector="{{page.noCssClasses(index)}}" stepKey="waitForCSSClasses"/>
15+
<remove keyForRemoval="dontSeeCSSClasses"/>
16+
</actionGroup>
17+
</actionGroups>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?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+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateAdvancedConfigurationWithAlignmentActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
11+
<annotations>
12+
<description value="Validates styles from Advanced configuration in without border and css classes"/>
13+
</annotations>
14+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).color" stepKey="grabColorValue" after="grabBorderColorValue"/>
15+
<remove keyForRemoval="assertBorderColor"/>
16+
<assertEquals stepKey="assertNoBorderColor" after="grabColorValue">
17+
<expectedResult type="variable">grabBorderColorValue</expectedResult>
18+
<actualResult type="variable">grabColorValue</actualResult>
19+
</assertEquals>
20+
<remove keyForRemoval="waitForCSSClassesVisible"/>
21+
<waitForElementVisible selector="{{page.noCssClasses(index)}}" stepKey="waitForNoCSSClassesVisible" after="grabBorderRadiusValue"/>
22+
</actionGroup>
23+
</actionGroups>

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?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+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup">
11+
<annotations>
12+
<description value="Validates Advanced configuration was not set"/>
13+
</annotations>
14+
<arguments>
15+
<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"/>
20+
<argument name="defaultMargin" defaultValue="0" type="string"/>
21+
<argument name="defaultPadding" defaultValue="0" type="string"/>
22+
<argument name="cssClasses" defaultValue=""/>
23+
<argument name="index" defaultValue="1" type="string"/>
24+
</arguments>
25+
<waitForElement selector="{{page.base(index)}}" stepKey="waitForElement"/>
26+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).textAlign" stepKey="grabAlignmentValue"/>
27+
<assertEquals stepKey="assertDefaultAlignmentVisible">
28+
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
29+
<actualResult type="variable">grabAlignmentValue</actualResult>
30+
</assertEquals>
31+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderStyle" stepKey="grabBorderStyleValue"/>
32+
<assertEquals stepKey="assertNoBorderStyle">
33+
<expectedResult type="string">{{border.value}}</expectedResult>
34+
<actualResult type="variable">grabBorderStyleValue</actualResult>
35+
</assertEquals>
36+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderColor" stepKey="grabBorderColorValue"/>
37+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).color" stepKey="grabColorValue"/>
38+
<assertEquals stepKey="assertNoBorderColor">
39+
<expectedResult type="variable">grabBorderColorValue</expectedResult>
40+
<actualResult type="variable">grabColorValue</actualResult>
41+
</assertEquals>
42+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderWidth.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderWidthValue"/>
43+
<assertEquals stepKey="assertNoBorderWidth">
44+
<expectedResult type="string">{{borderWidth.value}}</expectedResult>
45+
<actualResult type="variable">grabBorderWidthValue</actualResult>
46+
</assertEquals>
47+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).borderRadius.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderRadiusValue"/>
48+
<assertEquals stepKey="assertNoBorderRadius">
49+
<expectedResult type="string">{{borderRadius.value}}</expectedResult>
50+
<actualResult type="variable">grabBorderRadiusValue</actualResult>
51+
</assertEquals>
52+
<waitForElement selector="{{page.cssClasses(index, cssClasses.value)}}" stepKey="waitForCSSClasses"/>
53+
<dontSeeElement selector="{{page.cssClasses(index, cssClasses.value)}}" stepKey="dontSeeCSSClasses"/>
54+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).margin.replace(/px/g, &quot;&quot;)" stepKey="grabMarginValue"/>
55+
<assertEquals stepKey="assertNoMarginVisible">
56+
<expectedResult type="string">{{defaultMargin}}</expectedResult>
57+
<actualResult type="variable">grabMarginValue</actualResult>
58+
</assertEquals>
59+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).padding.replace(/px/g, &quot;&quot;)" stepKey="grabPaddingValue"/>
60+
<assertEquals stepKey="assertNoPaddingVisible">
61+
<expectedResult type="string">{{defaultPadding}}</expectedResult>
62+
<actualResult type="variable">grabPaddingValue</actualResult>
63+
</assertEquals>
64+
</actionGroup>
65+
</actionGroups>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?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+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateAdvancedConfigurationWithBorderColorActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
11+
<annotations>
12+
<description value="Validates Advanced configuration without Alignment and Css classes"/>
13+
</annotations>
14+
<arguments>
15+
<argument name="page" defaultValue=""/>
16+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
17+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
18+
</arguments>
19+
<assertEquals stepKey="assertAlignment">
20+
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
21+
<actualResult type="variable">grabAlignmentValue</actualResult>
22+
</assertEquals>
23+
<waitForElementVisible selector="{{page.noCssClasses(index)}}" stepKey="waitForCSSClassesVisible"/>
24+
</actionGroup>
25+
</actionGroups>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?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+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateAdvancedConfigurationWithCssClassesActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
11+
<annotations>
12+
<description value="Validates Advanced configuration without alignment and border"/>
13+
</annotations>
14+
<arguments>
15+
<argument name="page" defaultValue=""/>
16+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
17+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
18+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
19+
</arguments>
20+
<assertEquals stepKey="assertAlignment">
21+
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
22+
<actualResult type="variable">grabAlignmentValue</actualResult>
23+
</assertEquals>
24+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).color" stepKey="grabColorValue" after="grabBorderColorValue"/>
25+
<assertEquals stepKey="assertBorderColor">
26+
<expectedResult type="variable">grabBorderColorValue</expectedResult>
27+
<actualResult type="variable">grabColorValue</actualResult>
28+
</assertEquals>
29+
</actionGroup>
30+
</actionGroups>

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?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+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
11+
<annotations>
12+
<description value="Validate Advanced Configuration without Alignment, Css classes and Border"/>
13+
</annotations>
14+
<arguments>
15+
<argument name="page" defaultValue=""/>
16+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
17+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
18+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
19+
</arguments>
20+
<assertEquals stepKey="assertAlignment">
21+
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
22+
<actualResult type="variable">grabAlignmentValue</actualResult>
23+
</assertEquals>
24+
<executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedConfigurationPath(index)}}', document.body).iterateNext()).color" stepKey="grabColorValue" after="grabBorderColorValue"/>
25+
<assertEquals stepKey="assertBorderColor">
26+
<expectedResult type="variable">grabBorderColorValue</expectedResult>
27+
<actualResult type="variable">grabColorValue</actualResult>
28+
</assertEquals>
29+
<waitForElementVisible selector="{{page.noCssClasses(index)}}" stepKey="waitForCSSClassesVisible"/>
30+
</actionGroup>
31+
</actionGroups>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?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+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateAdvancedConfigurationWithNoAlignmentNotVisibleActionGroup" extends="ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup">
11+
<annotations>
12+
<description value="Validates Advanced configuration was not set and Css classes are not visible"/>
13+
</annotations>
14+
<waitForElement selector="{{page.noCssClasses(index)}}" stepKey="waitForCSSClasses"/>
15+
<dontSeeElement selector="{{page.noCssClasses(index)}}" stepKey="dontSeeCSSClasses"/>
16+
</actionGroup>
17+
</actionGroups>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?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+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateAdvancedConfigurationWithNoBorderActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
11+
<annotations>
12+
<description value="Validates styles from Advanced configuration without alignment and css classes"/>
13+
</annotations>
14+
<arguments>
15+
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
16+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
17+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
18+
</arguments>
19+
<assertEquals stepKey="assertAlignment">
20+
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>
21+
<actualResult type="variable">grabAlignmentValue</actualResult>
22+
</assertEquals>
23+
<remove keyForRemoval="grabBorderColorValue"/>
24+
<remove keyForRemoval="assertBorderColor"/>
25+
<waitForElementVisible selector="{{page.noCssClasses(index)}}" stepKey="waitForCSSClassesVisible"/>
26+
</actionGroup>
27+
</actionGroups>

0 commit comments

Comments
 (0)