Skip to content

Commit a8ca0ee

Browse files
davemacaulaydavemacaulay
committed
MC-3148: Create & Update MFTF Tests
- Fix MFTF failures - Fix static failures
1 parent 63c0b90 commit a8ca0ee

File tree

5 files changed

+69
-29
lines changed

5 files changed

+69
-29
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<arguments>
5656
<argument name="section" defaultValue="AdvancedForm"/>
5757
</arguments>
58+
<waitForPageLoad stepKey="waitForPageToFinishLoading"/>
5859
<waitForElementVisible selector="{{EditPanelForm.editPanelSectionName(section.dataIndex)}}" stepKey="waitForSectionVisible"/>
5960
<conditionalClick selector="{{EditPanelForm.editPanelSectionName(section.dataIndex)}}" dependentSelector="{{EditPanelForm.editPanelSectionExpanded(section.dataIndex)}}" visible="false" stepKey="expandSection"/>
6061
<waitForElementVisible selector="{{EditPanelForm.editPanelSectionExpanded(section.dataIndex)}}" stepKey="waitForSectionExpanded"/>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@
4141
</section>
4242
<section name="BlockOnStorefront">
4343
<element name="html" type="text" selector="(//div[@data-role='html'])[{{arg1}}]//a[contains(@class,'pagebuilder-button-primary')]" parameterized="true"/>
44-
<element name="base" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}]" parameterized="true"/>
45-
<element name="hr" type="button" selector="(//div[@data-role='row']/div)[{{arg1}}]/hr" parameterized="true"/>
44+
<element name="base" type="text" selector="(//div[@data-role='block'])[{{arg1}}]" parameterized="true"/>
45+
<element name="hr" type="button" selector="(//div[@data-role='block'])[{{arg1}}]/hr" parameterized="true"/>
4646
<element name="empty" type="text" selector="//div[@data-role='block'][{{arg1}}][not(*)]" parameterized="true"/>
4747
<!-- Advanced Configuration -->
48-
<element name="alignment" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
49-
<element name="noAlignment" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
50-
<element name="border" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
51-
<element name="borderColor" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
52-
<element name="noBorderColor" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
53-
<element name="borderWidth" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
54-
<element name="borderRadius" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
55-
<element name="cssClasses" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
48+
<element name="alignment" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
49+
<element name="noAlignment" type="text" selector="(//div[@data-role='block'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
50+
<element name="border" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
51+
<element name="borderColor" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
52+
<element name="noBorderColor" type="text" selector="(//div[@data-role='block'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
53+
<element name="borderWidth" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
54+
<element name="borderRadius" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
55+
<element name="cssClasses" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
5656
<element name="noCssClasses" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div[not(@class)]" parameterized="true"/>
57-
<element name="margins" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
58-
<element name="padding" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
57+
<element name="margins" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
58+
<element name="padding" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
5959
</section>
6060
</sections>

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

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
<element name="rowChildrenStyle" type="text" selector="(//div[contains(@class, 'pagebuilder-row')])[{{arg1}}]//div[contains(@class, 'element-children') and contains(@class, 'row-container')][contains(@style, '{{arg2}}')]" parameterized="true"/>
3232
<element name="rowWidthJS" type="text" selector="document.querySelectorAll('[data-appearance=\'{{arg1}}\']')[{{arg2}}].clientWidth" parameterized="true"/>
3333
<element name="rowH2ChildWidthJS" type="text" selector="document.querySelectorAll('div[data-appearance~=\'{{arg1}}\'] .element-children')[{{arg2}}].clientWidth" parameterized="true"/>
34-
<element name="appearance" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@data-appearance,'{{arg2}}')]" parameterized="true"/>
34+
<element name="appearanceContained" type="text" selector="(//div[contains(@class,'row-contained')])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
35+
<element name="appearanceFullWidthFullBleed" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
36+
3537
<!-- Background Configuration -->
3638
<element name="backgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
3739
<element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][not(contains(@style,'background-color:'))]" parameterized="true"/>
@@ -68,11 +70,11 @@
6870
<element name="rowStyle" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style, '{{arg2}}')]" parameterized="true"/>
6971
<element name="rowWidthJS" type="text" selector="document.querySelectorAll('[data-appearance=\'{{arg1}}\']')[{{arg2}}].clientWidth" parameterized="true"/>
7072
<element name="rowH2ChildWidthJS" type="text" selector="document.querySelectorAll('div[data-appearance~=\'{{arg1}}\'] h2')[{{arg2}}].clientWidth" parameterized="true"/>
71-
<element name="appearance" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@data-appearance,'{{arg2}}')]" parameterized="true"/>
73+
<element name="appearance" type="text" selector="(//div[@data-role='row'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
7274
<!-- Background Configuration -->
7375
<element name="backgroundColor" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
7476
<element name="noBackgroundColor" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[not(contains(@style,'background-color:'))]" parameterized="true"/>
75-
<element name="backgroundImage" type="button" selector='(//div[@data-role="row"])[{{arg1}}][contains(@style,"background-image: url(&apos;") and contains(@style,"/{{arg2}}_") and contains(@style,".{{arg3}}&apos;);")]' parameterized="true"/>
77+
<element name="backgroundImage" type="button" selector='(//div[@data-role="row"])[{{arg1}}]/div[contains(@style,"background-image: url(&apos;") and contains(@style,"/{{arg2}}_") and contains(@style,".{{arg3}}&apos;);")]' parameterized="true"/>
7678
<element name="noBackgroundImage" type="button" selector='(//div[@data-role="row"])[{{arg1}}][not(contains(@style,"background-image:"))]' parameterized="true"/>
7779
<element name="backgroundPosition" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
7880
<element name="backgroundSize" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
@@ -82,7 +84,7 @@
8284
<element name="parallaxClass" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[@class='jarallax']" parameterized="true"/>
8385
<element name="parallaxState" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[@data-enable-parallax='{{arg2}}']" parameterized="true"/>
8486
<element name="parallaxSpeed" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[@data-parallax-speed='{{arg2}}']" parameterized="true"/>
85-
<element name="parallaxBackgroundImage" type="button" selector='(//div[@data-role="row"])[{{arg1}}][contains(@data-jarallax-original-styles,"background-image: url(&apos;") and contains(@data-jarallax-original-styles,"{{arg2}}") and contains(@data-jarallax-original-styles,"{{arg3}}&apos;);")]' parameterized="true"/>
87+
<element name="parallaxBackgroundImage" type="button" selector='(//div[@data-role="row"])[{{arg1}}]/div[contains(@data-jarallax-original-styles,"background-image: url(&apos;") and contains(@data-jarallax-original-styles,"{{arg2}}") and contains(@data-jarallax-original-styles,"{{arg3}}&apos;);")]' parameterized="true"/>
8688
<!-- Layout Configuration -->
8789
<element name="minHeight" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style, 'min-height: {{arg2}}px;')]" parameterized="true"/>
8890
<element name="verticalAlignContainer" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style, 'justify-content: {{arg2}};')]" parameterized="true"/>
@@ -99,6 +101,43 @@
99101
<element name="margins" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
100102
<element name="padding" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
101103
</section>
104+
<section name="RowOnStorefront_FullWidth_FullBleed">
105+
<element name="base" type="text" selector="(//div[@data-role='row'])[{{arg1}}]" parameterized="true"/>
106+
<element name="computedWidth" type="text" selector="parseInt(window.getComputedStyle(document.querySelector('[data-role=row]')).width)"/>
107+
<element name="rowStyle" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style, '{{arg2}}')]" parameterized="true"/>
108+
<element name="rowWidthJS" type="text" selector="document.querySelectorAll('[data-appearance=\'{{arg1}}\']')[{{arg2}}].clientWidth" parameterized="true"/>
109+
<element name="rowH2ChildWidthJS" type="text" selector="document.querySelectorAll('div[data-appearance~=\'{{arg1}}\'] h2')[{{arg2}}].clientWidth" parameterized="true"/>
110+
<element name="appearance" type="text" selector="(//div[@data-role='row'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
111+
<!-- Background Configuration -->
112+
<element name="backgroundColor" type="button" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
113+
<element name="noBackgroundColor" type="button" selector="(//div[@data-role='row'])[{{arg1}}][not(contains(@style,'background-color:'))]" parameterized="true"/>
114+
<element name="backgroundImage" type="button" selector='(//div[@data-role="row"])[{{arg1}}][contains(@style,"background-image: url(&apos;") and contains(@style,"/{{arg2}}_") and contains(@style,".{{arg3}}&apos;);")]' parameterized="true"/>
115+
<element name="noBackgroundImage" type="button" selector='(//div[@data-role="row"])[{{arg1}}][not(contains(@style,"background-image:"))]' parameterized="true"/>
116+
<element name="backgroundPosition" type="button" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
117+
<element name="backgroundSize" type="button" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
118+
<element name="backgroundRepeat" type="button" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
119+
<element name="backgroundAttachment" type="button" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
120+
<!-- Parallax Background Configuration -->
121+
<element name="parallaxClass" type="button" selector="(//div[@data-role='row'])[{{arg1}}][@class='jarallax']" parameterized="true"/>
122+
<element name="parallaxState" type="button" selector="(//div[@data-role='row'])[{{arg1}}][@data-enable-parallax='{{arg2}}']" parameterized="true"/>
123+
<element name="parallaxSpeed" type="button" selector="(//div[@data-role='row'])[{{arg1}}][@data-parallax-speed='{{arg2}}']" parameterized="true"/>
124+
<element name="parallaxBackgroundImage" type="button" selector='(//div[@data-role="row"])[{{arg1}}][contains(@data-jarallax-original-styles,"background-image: url(&apos;") and contains(@data-jarallax-original-styles,"{{arg2}}") and contains(@data-jarallax-original-styles,"{{arg3}}&apos;);")]' parameterized="true"/>
125+
<!-- Layout Configuration -->
126+
<element name="minHeight" type="button" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style, 'min-height: {{arg2}}px;')]" parameterized="true"/>
127+
<element name="verticalAlignContainer" type="button" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style, 'justify-content: {{arg2}};')]" parameterized="true"/>
128+
<!-- Advanced Configuration -->
129+
<element name="alignment" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
130+
<element name="noAlignment" type="text" selector="(//div[@data-role='row'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
131+
<element name="border" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
132+
<element name="borderColor" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
133+
<element name="noBorderColor" type="text" selector="(//div[@data-role='row'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
134+
<element name="borderWidth" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
135+
<element name="borderRadius" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
136+
<element name="cssClasses" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
137+
<element name="noCssClasses" type="text" selector="(//div[@data-role='row'])[{{arg1}}][not(@class)]" parameterized="true"/>
138+
<element name="margins" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
139+
<element name="padding" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
140+
</section>
102141
<section name="ParallaxForm">
103142
<element name="sectionName" type="button" selector="//div[@data-index='parallax_background']"/>
104143
<element name="sectionExpanded" type="button" selector="//div[@data-index='parallax_background' and contains(@class,'_show')]"/>

0 commit comments

Comments
 (0)