Skip to content

Extending MFTF Tests #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 21, 2020
Merged

Extending MFTF Tests #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b730f27
magento/magento2-page-builder#558: Content Types Output Style Attribu…
bluemwhitew Oct 20, 2020
e40ceb0
magento/magento2-page-builder#558: Content Types Output Style Attribu…
bluemwhitew Oct 20, 2020
f5e2db7
magento/magento2-page-builder#558: Content Types Output Style Attribu…
bluemwhitew Oct 20, 2020
577f293
Merge branch 'csso-alternative' of github.com:magento/magento2-page-b…
omiroshnichenko Oct 20, 2020
84c53ae
magento/magento2-page-builder#558: Content Types Output Style Attribu…
omiroshnichenko Oct 20, 2020
a242097
magento/magento2-page-builder#558: Content Types Output Style Attribu…
omiroshnichenko Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,18 @@
<data key="fieldName">css_classes</data>
<data key="value">first-class second-class third-class</data>
</entity>
<entity name="PageBuilderAdvancedCssClassesPropertyCssSpecificity" type="pagebuilder_advanced_css_classes_property">
<data key="name">CSS Classes</data>
<data key="section">advanced</data>
<data key="fieldName">css_classes</data>
<data key="value">css__specificity</data>
</entity>
<entity name="PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling" type="pagebuilder_advanced_css_classes_property">
<data key="name">CSS Classes</data>
<data key="section">advanced</data>
<data key="fieldName">css_classes</data>
<data key="value">css__responsive-styling</data>
</entity>
<entity name="PageBuilderAdvancedCssClassesProperty_Invalid_GreaterThan" type="pagebuilder_advanced_css_classes_property">
<data key="name">CSS Classes</data>
<data key="section">advanced</data>
Expand Down Expand Up @@ -338,6 +350,41 @@
<data key="fieldName">color</data>
<data key="value">#ffffff</data>
</entity>
<entity name="PageBuilderAdvancedTextColorProperty_CadetBlue" type="pagebuilder_advanced_color_property">
<data key="name">Text Color</data>
<data key="section">advanced</data>
<data key="fieldName">color</data>
<data key="value">#5f9ea0</data>
<data key="rgb">rgb(95, 158, 160)</data>
</entity>
<entity name="PageBuilderAdvancedTextColorProperty_CornflowerBlue" type="pagebuilder_advanced_color_property">
<data key="name">Text Color</data>
<data key="section">advanced</data>
<data key="fieldName">color</data>
<data key="value">#6495ed</data>
<data key="rgb">rgb(100, 149, 237)</data>
</entity>
<entity name="PageBuilderAdvancedTextColorProperty_DarkOrchid" type="pagebuilder_advanced_color_property">
<data key="name">Text Color</data>
<data key="section">advanced</data>
<data key="fieldName">color</data>
<data key="value">#9932cc</data>
<data key="rgb">rgb(153, 50, 204)</data>
</entity>
<entity name="PageBuilderAdvancedTextColorProperty_DeepPink" type="pagebuilder_advanced_color_property">
<data key="name">Text Color</data>
<data key="section">advanced</data>
<data key="fieldName">color</data>
<data key="value">#ff1493</data>
<data key="rgb">rgb(255, 20, 147)</data>
</entity>
<entity name="PageBuilderAdvancedTextColorProperty_MidnightBlue" type="pagebuilder_advanced_color_property">
<data key="name">Text Color</data>
<data key="section">advanced</data>
<data key="fieldName">color</data>
<data key="value">#191970</data>
<data key="rgb">rgb(25, 25, 112)</data>
</entity>
<!-- Margins -->
<entity name="PageBuilderMarginsPropertyDefault" type="pagebuilder_margins_property">
<data key="name">Margins and Padding</data>
Expand Down
18 changes: 18 additions & 0 deletions app/code/Magento/PageBuilder/Test/Mftf/Data/HtmlData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,22 @@
<data key="selector">[contains(text(), 'a class="pagebuilder-button-primary"')]</data>
<data key="selectorOnFrontend">//a[@class='pagebuilder-button-primary' and @onclick=&quot;location.href = 'https://google.com';&quot;]//span[.='Duplicate Button']</data>
</entity>
<entity name="PageBuilderHtmlPropertyCssSpecificityWithoutBodyId" type="pagebuilder_html_property">
<data key="name">HTML</data>
<data key="section">general</data>
<data key="fieldName">html</data>
<data key="value">&lt;style type=&quot;text/css&quot;&gt;.css__specificity { text-align: center; }&lt;/style&gt;</data>
</entity>
<entity name="PageBuilderHtmlPropertyCssSpecificityWithBodyId" type="pagebuilder_html_property">
<data key="name">HTML</data>
<data key="section">general</data>
<data key="fieldName">html</data>
<data key="value">&lt;style type=&quot;text/css&quot;&gt;#html-body .css__specificity { text-align: center; }&lt;/style&gt;</data>
</entity>
<entity name="PageBuilderHtmlPropertyCssResponsiveStyling" type="pagebuilder_html_property">
<data key="name">HTML</data>
<data key="section">general</data>
<data key="fieldName">html</data>
<data key="value">&lt;style type=&quot;text/css&quot;&gt;#html-body .css__responsive-styling { color: #5f9ea0; } @media (min-width: 576px) { #html-body .css__responsive-styling { color: #6495ed; }} @media (min-width: 768px) { #html-body .css__responsive-styling { color: #9932cc; }} @media (min-width: 992px) { #html-body .css__responsive-styling { color: #ff1493; }} @media (min-width: 1200px) { #html-body .css__responsive-styling { color: #191970; }}&lt;/style&gt;</data>
</entity>
</entities>
7 changes: 3 additions & 4 deletions ...to/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStorefrontSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
* See COPYING.txt for license details.
*/
-->
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="HeadingOnStorefront">
<element name="base" type="text" selector="(//*[@data-content-type='heading'])[{{arg2}}]" parameterized="true"/>
<element name="baseByTagName" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}]" parameterized="true"/>
Expand All @@ -25,8 +24,8 @@
<element name="noBorderColor" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][not(contains(@style,'border-color:'))]" parameterized="true" deprecated="Styles are not inline"/>
<element name="borderWidth" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@style,'border-width: {{arg3}}px;')]" parameterized="true" deprecated="Styles are not inline"/>
<element name="borderRadius" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@style,'border-radius: {{arg3}}px;')]" parameterized="true" deprecated="Styles are not inline"/>
<element name="cssClasses" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@class,'{{arg3}}')]" parameterized="true"/>
<element name="noCssClasses" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][not(@class)]" parameterized="true"/>
<element name="cssClasses" type="text" selector="(//{{arg1}}[@data-content-type=&quot;heading&quot;])[{{arg2}}][contains(@class,&quot;{{arg3}}&quot;)]" parameterized="true"/>
<element name="noCssClasses" type="text" selector="(//{{arg1}}[@data-content-type=&quot;heading&quot;])[{{arg2}}][not(@class)]" parameterized="true"/>
<element name="margins" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@style,'margin: {{arg3}}px;')]" parameterized="true" deprecated="Styles are not inline"/>
<element name="noMargins" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][not(contains(@style,'margin:'))]" parameterized="true" deprecated="Styles are not inline"/>
<element name="padding" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@style,'padding: {{arg3}}px;')]" parameterized="true" deprecated="Styles are not inline"/>
Expand Down
107 changes: 107 additions & 0 deletions ...minPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssResponsiveStylingTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdvancedConfigurationCssResponsiveStylingTest">
<annotations>
<features value="PageBuilder"/>
<stories value="Advanced Configuration"/>
<title value="Heading - CSS Responsive Styling"/>
<description value="Internal (or external) CSS should be able to use media queries to override Page Builder styles that would previously have been inlined."/>
<severity value="MAJOR"/>
<group value="pagebuilder"/>
<group value="pagebuilder-heading"/>
<group value="pagebuilder-advancedConfig"/>
</annotations>
<before>
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
<actionGroup ref="AdminOpenCmsPageActionGroup" stepKey="goToCMSPage">
<argument name="page_id" value="$$createCMSPage.id$$"/>
</actionGroup>
<actionGroup ref="switchToPageBuilderStage" stepKey="waitForPageBuilderDisplay"/>
</before>
<after>
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
<argument name="contentType" value="PageBuilderHeadingContentType"/>
</actionGroup>
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
<argument name="contentType" value="PageBuilderHeadingContentType"/>
</actionGroup>
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
<argument name="index" value="1"/>
</actionGroup>
<actionGroup ref="openPageBuilderEditPanel" stepKey="openPageBuilderEditPanel">
<argument name="contentType" value="PageBuilderHeadingContentType"/>
</actionGroup>
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHeadingTextProperty">
<argument name="property" value="PageBuilderHeadingTextProperty"/>
</actionGroup>
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHeadingClassesProperty">
<argument name="property" value="PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling"/>
</actionGroup>
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage2">
<argument name="contentType" value="PageBuilderHtmlContentType"/>
</actionGroup>
<actionGroup ref="openPageBuilderEditPanel" stepKey="openPageBuilderEditPanel2">
<argument name="contentType" value="PageBuilderHtmlContentType"/>
</actionGroup>
<actionGroup ref="fillSlideOutPanelTextArea" stepKey="enterHtmlContent">
<argument name="property" value="PageBuilderHtmlPropertyCssResponsiveStyling"/>
</actionGroup>
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
<!-- Verify in Stage -->
<actionGroup ref="verifyHeadingInStage" stepKey="verifyHeadingInStage">
<argument name="headingType" value="PageBuilderHeadingTypeDefaultProperty"/>
</actionGroup>
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
<!-- Verify in Storefront -->
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">
<argument name="page" value="$$createCMSPage.identifier$$"/>
</actionGroup>
<!-- Testing for Viewport: Extra Small -->
<resizeWindow width="575" height="1000" stepKey="resizeWindowToExtraSmall"/>
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForExtraSmall">
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_CadetBlue.rgb}}"/>
<argument name="cssProperty" value="color"/>
</actionGroup>
<!-- Testing for Viewport: Small -->
<resizeWindow width="767" height="1000" stepKey="resizeWindowToSmall"/>
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForSmall">
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_CornflowerBlue.rgb}}"/>
<argument name="cssProperty" value="color"/>
</actionGroup>
<!-- Testing for Viewport: Medium -->
<resizeWindow width="991" height="1000" stepKey="resizeWindowToMedium"/>
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForMedium">
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_DarkOrchid.rgb}}"/>
<argument name="cssProperty" value="color"/>
</actionGroup>
<!-- Testing for Viewport: Large -->
<resizeWindow width="1199" height="1000" stepKey="resizeWindowToLarge"/>
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForLarge">
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_DeepPink.rgb}}"/>
<argument name="cssProperty" value="color"/>
</actionGroup>
<!-- Testing for Viewport: Extra Large -->
<resizeWindow width="1440" height="1000" stepKey="resizeWindowToExtraLarge"/>
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForExtraLarge">
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_MidnightBlue.rgb}}"/>
<argument name="cssProperty" value="color"/>
</actionGroup>
</test>
</tests>
Loading