Skip to content

Commit 3ce51a4

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'MC-3852-background-attributes-tab' into cms-team-1-delivery
2 parents 8a60f1a + a5a683b commit 3ce51a4

14 files changed

+619
-387
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,20 @@
162162
<actualResult type="variable">$backgroundImageValue</actualResult>
163163
</assertRegExp>
164164
</actionGroup>
165+
<actionGroup name="validateNoBackgroundImage">
166+
<arguments>
167+
<argument name="section"/>
168+
<argument name="index" defaultValue="1" type="string"/>
169+
</arguments>
170+
<comment userInput="validateBackgroundImage" stepKey="comment"/>
171+
<waitForElementVisible selector="{{section.base(index)}}" stepKey="waitForBaseElement"/>
172+
<!-- Retrieve background image from computed styles -->
173+
<executeJS function="return window.getComputedStyle({{section.baseJS(index)}}).backgroundImage" stepKey="backgroundImageValue"/>
174+
<assertEquals stepKey="assertBackgroundImageNone">
175+
<expectedResult type="string">none</expectedResult>
176+
<actualResult type="variable">$backgroundImageValue</actualResult>
177+
</assertEquals>
178+
</actionGroup>
165179
<actionGroup name="validateBackgroundImageContainer">
166180
<arguments>
167181
<argument name="section"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<data key="value">magento3.jpg</data>
144144
<data key="fileName">magento3</data>
145145
<data key="extension">jpg</data>
146-
<data key="path">wysiwyg/magento3</data>
146+
<data key="path">wysiwyg</data>
147147
</entity>
148148
<entity name="PageBuilderBackgroundImageRoot_JPG" type="pagebuilder_background_image_property">
149149
<data key="name">Background Image</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="ColumnOnBackend">
1212
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
13+
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=column]')[{{arg1}} - 1]" parameterized="true"/>
1314
<element name="allColumns" type="text" selector="//div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')]"/>
1415
<element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-column')])[{{arg1}}][@style='border: {{arg2}}; border-radius: {{arg3}}px; margin: {{arg4}}px; padding: {{arg5}}px; width: {{arg6}}; background-size: {{arg7}}; background-repeat: {{arg8}}; background-attachment: {{arg9}}; align-self: {{arg10}};']" parameterized="true"/>
1516
<element name="empty" type="button" selector="(//div[contains(@class,'empty-container')]//div[contains(@class,'element-children') and contains(@class,'column-container')])[{{arg1}}]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<section name="RowOnStage">
2626
<element name="allRows" type="text" selector="//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')]"/>
2727
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]" parameterized="true"/>
28+
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=row]')[{{arg1}} - 1]" parameterized="true"/>
2829
<element name="hidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
2930
<element name="notHidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
3031
<element name="baseCss" type="text" selector="div.pagebuilder-content-type.pagebuilder-row"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection.xml

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
</section>
3636
<section name="TabOnStage">
3737
<element name="base" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]" parameterized="true"/>
38+
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=tab-item]')[{{arg1}} - 1]" parameterized="true"/>
3839
<element name="all" type="button" selector=".pagebuilder-tab-item"/>
3940
<element name="tabHeader" type="button" selector="(//ul[contains(@class, 'tabs-navigation')]//a[contains(@class, 'tab-title')])[{{arg1}}]" parameterized="true"/>
4041
<element name="tabHeaderEditableTitle" type="button" selector="(//ul[contains(@class, 'tabs-navigation')]//a[contains(@class, 'tab-title')])[{{arg1}}]//span[contains(@contenteditable, 'true')]" parameterized="true"/>
@@ -70,49 +71,40 @@
7071
<element name="tabTextContent" type="button" selector="//div[@class='pagebuilder-text']"/>
7172
<element name="tabColumnContent" type="button" selector="//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class, 'pagebuilder-column-group')]"/>
7273
<!-- Background Configuration -->
73-
<element name="backgroundPosition" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
74-
<element name="backgroundSize" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
75-
<element name="backgroundRepeat" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
76-
<element name="backgroundAttachment" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
77-
<element name="backgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
78-
<element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][not(contains(@style,'background-color:'))]" parameterized="true"/>
79-
<element name="backgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
80-
<element name="noBackgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][not(contains(@style,'background-image:'))]" parameterized="true"/>
74+
<element name="backgroundPosition" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item')])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
75+
<element name="backgroundSize" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item')])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
76+
<element name="backgroundRepeat" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item')])[{{arg1}}][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
77+
<element name="backgroundAttachment" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item')])[{{arg1}}][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
78+
<element name="backgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item')])[{{arg1}}][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
79+
<element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item')])[{{arg1}}][not(contains(@style,'background-color:'))]" parameterized="true"/>
80+
<element name="backgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item')])[{{arg1}}][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
81+
<element name="noBackgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item')])[{{arg1}}][not(contains(@style,'background-image:'))]" parameterized="true"/>
8182
</section>
8283
<section name="TabOnStorefront">
8384
<element name="all" type="button" selector="[data-role=\'tab-item\']"/>
8485
<element name="base" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]" parameterized="true"/>
86+
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=tab-item]')[{{arg1}} - 1]" parameterized="true"/>
8587
<element name="tabHeader" type="button" selector="(//li[contains(@role, 'tab')])[{{arg1}}]" parameterized="true"/>
8688
<element name="tabHeaderItemActive" type="button" selector="(//div[@data-role='tabs']//descendant::*[@role='tablist'])/li[{{arg1}}][contains(@class, 'ui-state-active')]" parameterized="true"/>
8789
<element name="tabPanel" type="button" selector="(//div[@class='tabs-content']//div[@role='tabpanel'])[{{arg1}}]" parameterized="true"/>
8890
<element name="tabContent" type="button" selector="div.tabs-content div[data-role=tab-item]:nth-child({{arg1}})" parameterized="true"/>
8991
<element name="container" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}]" parameterized="true"/>
9092
<element name="containerStyle" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@style,'{{arg2}}')]" parameterized="true"/>
9193
<element name="noMinHeight" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][not(contains(@style,'min-height:'))]" parameterized="true"/>
92-
<element name="minHeight" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
94+
<element name="minHeight" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
9395
<element name="verticalAlignContainer" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
94-
<element name="tabContentBackgroundImage" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style, 'background-image: url') and contains(@style, '{{arg2}}') and contains(@style, '{{arg3}}')]" parameterized="true"/>
9596
<element name="tabContentType" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}]/div[1]/hr" parameterized="true"/>
9697
<element name="tabContentText" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}]//div[contains(@data-role, 'text')][1]" parameterized="true"/>
9798
<element name="tabContentAdvancedStylesBorder" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@style, 'border-style: {{arg2}}') and contains(@style, 'border-color: {{arg3}}') and contains(@style, 'border-width: {{arg4}}px') and contains(@style, 'border-radius: {{arg5}}px')]" parameterized="true"/>
98-
<element name="tabContentAdvancedStyles" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style, 'text-align: {{arg2}}') and contains(@style, 'margin: {{arg3}}px') and contains(@style, 'padding: {{arg4}}px')]" parameterized="true"/>
99+
<element name="tabContentAdvancedStyles" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@style, 'text-align: {{arg2}}') and contains(@style, 'margin: {{arg3}}px') and contains(@style, 'padding: {{arg4}}px')]" parameterized="true"/>
99100
<element name="tabContentAdvancedClass" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@class, '{{arg2}}')]" parameterized="true"/>
100101
<!-- Background Configuration -->
101-
<element name="backgroundPosition" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
102-
<element name="backgroundSize" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
103-
<element name="backgroundRepeat" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
104-
<element name="backgroundAttachment" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
105-
<element name="backgroundColor" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
106-
<element name="noBackgroundColor" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-color:'))]" parameterized="true"/>
107-
<element name="backgroundImage" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
108-
<element name="noBackgroundImage" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-image:'))]" parameterized="true"/>
109-
<element name="backgroundMobileImage" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
110-
<element name="mobileBackgroundPosition" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
111-
<element name="mobileBackgroundSize" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
112-
<element name="mobileBackgroundRepeat" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
113-
<element name="mobileBackgroundAttachment" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
114-
<element name="mobileBackgroundColor" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
115-
<element name="noMobileBackgroundColor" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='mobile_image'][not(contains(@style,'background-color:'))]" parameterized="true"/>
116-
<element name="noMobileBackgroundImage" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='mobile_image'][not(contains(@style,'background-image:'))]" parameterized="true"/>
102+
<element name="backgroundPosition" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
103+
<element name="backgroundSize" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
104+
<element name="backgroundRepeat" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
105+
<element name="backgroundAttachment" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
106+
<element name="backgroundColor" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
107+
<element name="noBackgroundColor" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}][not(contains(@style,'background-color:'))]" parameterized="true"/>
108+
<element name="noBackgroundImage" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}][not(contains(@style,'background-image:'))]" parameterized="true"/>
117109
</section>
118110
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTests.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,7 +1899,7 @@
18991899
</before>
19001900
<after>
19011901
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
1902-
<!--<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>-->
1902+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
19031903
<actionGroup ref="logout" stepKey="logout"/>
19041904
</after>
19051905
<!-- Add Button Group To Tab -->
@@ -1968,9 +1968,6 @@
19681968
<actionGroup ref="validateButtonItemsSameSize" stepKey="validateButtonsSameSizeStorefrontMobile1">
19691969
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
19701970
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
1971-
<argument name="buttonGroupIndex" value="2"/>
1972-
<argument name="firstButtonIndex" value="3"/>
1973-
<argument name="secondButtonIndex" value="4"/>
19741971
</actionGroup>
19751972
<executeJS function="return document.querySelectorAll('{{TabOnStorefront.all}}')[0].offsetWidth" stepKey="tabWidthStorefrontMobile"/>
19761973
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile"/>

0 commit comments

Comments
 (0)