Skip to content

Commit 47f500a

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge branch 'develop' into hackathon
2 parents 1b6dba3 + 6018486 commit 47f500a

15 files changed

+276
-85
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@
9797
<waitForElementNotVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForVariableModalToClose"/>
9898
<waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextArea"/>
9999
<executeJS function="return document.getElementById('{{TextOnConfiguration.textAreaId}}').value;" stepKey="getText"/>
100-
<assertContains actual="getText" actualType="variable" expected="{{variable.editPanelValue}}" expectedType="string" stepKey="assertValue"/>
100+
<assertContains stepKey="assertValue">
101+
<expectedResult type="string">{{variable.editPanelValue}}</expectedResult>
102+
<actualResult type="variable">getText</actualResult>
103+
</assertContains>
101104
</actionGroup>
102105
<actionGroup name="addPageLinkWidgetToTinyMCE">
103106
<arguments>
@@ -152,7 +155,10 @@
152155
<click selector="{{TextOnConfiguration.insertWidgetButton}}" stepKey="clickAddWidgetBtn"/>
153156
<waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForInsertWidgetModalToClose"/>
154157
<executeJS function="return document.getElementById('{{TextOnConfiguration.textAreaId}}').value;" stepKey="getText"/>
155-
<assertContains actual="getText" actualType="variable" expected="{{widget.editPanelValue}}" expectedType="string" stepKey="assertValue"/>
158+
<assertContains stepKey="assertValue">
159+
<expectedResult type="string">{{widget.editPanelValue}}</expectedResult>
160+
<actualResult type="variable">getText</actualResult>
161+
</assertContains>
156162
</actionGroup>
157163
<actionGroup name="validateTextInTinyMCE">
158164
<arguments>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@
108108
<comment userInput="Check Drop Down Counts" stepKey="commentCheckDropDownCounts"/>
109109
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderAdvancedAlignmentPropertyDefault.section, PageBuilderAdvancedAlignmentPropertyDefault.fieldName)}}" userInput="value" stepKey="getDropDownCountAlignment"/>
110110
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderAdvancedBorderPropertyDefault.section, PageBuilderAdvancedBorderPropertyDefault.fieldName)}}" userInput="value" stepKey="getDropDownCountBorder"/>
111-
<assertCount actual="getDropDownCountBorder" actualType="variable" expected="10" expectedType="int" stepKey="assertDropDownCountBorder"/>
111+
<assertCount stepKey="assertDropDownCountBorder">
112+
<actualResult type="variable">getDropDownCountBorder</actualResult>
113+
<expectedResult type="int">10</expectedResult>
114+
</assertCount>
112115
<!-- Check Placeholder Text -->
113116
<comment userInput="Check Placeholder Text" stepKey="commentCheckPlaceholderText"/>
114117
<actionGroup ref="validateSlideOutPanelFieldPlaceholderText" stepKey="checkPlaceholderTextBorderColor">

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -687,15 +687,19 @@
687687
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
688688
</actionGroup>
689689
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedBorderColorDefaultProperty.section, PageBuilderAdvancedBorderColorDefaultProperty.fieldName)}}" stepKey="getBorderColor"/>
690-
<assertEmpty actual="getBorderColor" actualType="variable" message="Text field has text: $getBorderColor" stepKey="assertBorderColor"/>
690+
<assertEmpty message="Text field has text: $getBorderColor" stepKey="assertBorderColor">
691+
<actualResult type="variable">getBorderColor</actualResult>
692+
</assertEmpty>
691693
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderWidth">
692694
<argument name="property" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
693695
</actionGroup>
694696
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderRadius">
695697
<argument name="property" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
696698
</actionGroup>
697699
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedCssClassesDefaultProperty.section, PageBuilderAdvancedCssClassesDefaultProperty.fieldName)}}" stepKey="getCssClasses"/>
698-
<assertEmpty actual="getCssClasses" actualType="variable" message="Text field was not empty. Had text: $getCssClasses" stepKey="assertCssClasses"/>
700+
<assertEmpty message="Text field has text: $getCssClasses" stepKey="assertCssClasses">
701+
<actualResult type="variable">getCssClasses</actualResult>
702+
</assertEmpty>
699703
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
700704
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
701705
</actionGroup>
@@ -739,15 +743,19 @@
739743
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
740744
</actionGroup>
741745
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedBorderColorDefaultProperty.section, PageBuilderAdvancedBorderColorDefaultProperty.fieldName)}}" stepKey="getBorderColor2"/>
742-
<assertEmpty actual="getBorderColor2" actualType="variable" message="Text field has text: $getBorderColor2" stepKey="assertBorderColor2"/>
746+
<assertEmpty message="Text field has text: $getBorderColor2" stepKey="assertBorderColor2">
747+
<actualResult type="variable">getBorderColor2</actualResult>
748+
</assertEmpty>
743749
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderWidth2">
744750
<argument name="property" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
745751
</actionGroup>
746752
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderRadius2">
747753
<argument name="property" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
748754
</actionGroup>
749755
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedCssClassesDefaultProperty.section, PageBuilderAdvancedCssClassesDefaultProperty.fieldName)}}" stepKey="getCssClasses2"/>
750-
<assertEmpty actual="getCssClasses2" actualType="variable" message="Text field was not empty. Had text: $getCssClasses2" stepKey="assertCssClasses2"/>
756+
<assertEmpty message="Text field has text: $getCssClasses2" stepKey="assertCssClasses2">
757+
<actualResult type="variable">getCssClasses2</actualResult>
758+
</assertEmpty>
751759
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins2">
752760
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
753761
</actionGroup>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,15 +1053,19 @@
10531053
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
10541054
</actionGroup>
10551055
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedBorderColorDefaultProperty.section, PageBuilderAdvancedBorderColorDefaultProperty.fieldName)}}" stepKey="getBorderColor"/>
1056-
<assertEmpty actual="getBorderColor" actualType="variable" message="Text field has text: $getBorderColor" stepKey="assertBorderColor"/>
1056+
<assertEmpty message="Text field has text: $getBorderColor" stepKey="assertBorderColor">
1057+
<actualResult type="variable">getBorderColor</actualResult>
1058+
</assertEmpty>
10571059
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderWidth">
10581060
<argument name="property" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
10591061
</actionGroup>
10601062
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderRadius">
10611063
<argument name="property" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
10621064
</actionGroup>
10631065
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedCssClassesDefaultProperty.section, PageBuilderAdvancedCssClassesDefaultProperty.fieldName)}}" stepKey="getCssClasses"/>
1064-
<assertEmpty actual="getCssClasses" actualType="variable" message="Text field was not empty. Had text: $getCssClasses" stepKey="assertCssClasses"/>
1066+
<assertEmpty message="Text field was not empty. Had text: $getCssClasses" stepKey="assertCssClasses">
1067+
<actualResult type="variable">getCssClasses</actualResult>
1068+
</assertEmpty>
10651069
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
10661070
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
10671071
</actionGroup>

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,19 @@
223223
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
224224
</actionGroup>
225225
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedBorderColorDefaultProperty.section, PageBuilderAdvancedBorderColorDefaultProperty.fieldName)}}" stepKey="getBorderColor"/>
226-
<assertEmpty actual="getBorderColor" actualType="variable" message="Text field has text: $getBorderColor" stepKey="assertBorderColor"/>
226+
<assertEmpty message="Text field has text: $getBorderColor" stepKey="assertBorderColor">
227+
<actualResult type="variable">getBorderColor</actualResult>
228+
</assertEmpty>
227229
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderWidth">
228230
<argument name="property" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
229231
</actionGroup>
230232
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderRadius">
231233
<argument name="property" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
232234
</actionGroup>
233235
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedCssClassesDefaultProperty.section, PageBuilderAdvancedCssClassesDefaultProperty.fieldName)}}" stepKey="getCssClasses"/>
234-
<assertEmpty actual="getCssClasses" actualType="variable" message="Text field was not empty. Had text: $getCssClasses" stepKey="assertCssClasses"/>
236+
<assertEmpty message="Text field was not empty. Had text: $getCssClasses" stepKey="assertCssClasses">
237+
<actualResult type="variable">getCssClasses</actualResult>
238+
</assertEmpty>
235239
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
236240
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
237241
</actionGroup>
@@ -275,15 +279,19 @@
275279
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
276280
</actionGroup>
277281
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedBorderColorDefaultProperty.section, PageBuilderAdvancedBorderColorDefaultProperty.fieldName)}}" stepKey="getBorderColor2"/>
278-
<assertEmpty actual="getBorderColor2" actualType="variable" message="Text field has text: $getBorderColor2" stepKey="assertBorderColor2"/>
282+
<assertEmpty message="Text field has text: $getBorderColor2" stepKey="assertBorderColor2">
283+
<actualResult type="variable">getBorderColor2</actualResult>
284+
</assertEmpty>
279285
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderWidth2">
280286
<argument name="property" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
281287
</actionGroup>
282288
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderRadius2">
283289
<argument name="property" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
284290
</actionGroup>
285291
<grabValueFrom selector="{{EditPanelForm.panelFieldControl(PageBuilderAdvancedCssClassesDefaultProperty.section, PageBuilderAdvancedCssClassesDefaultProperty.fieldName)}}" stepKey="getCssClasses2"/>
286-
<assertEmpty actual="getCssClasses2" actualType="variable" message="Text field was not empty. Had text: $getCssClasses2" stepKey="assertCssClasses2"/>
292+
<assertEmpty message="Text field was not empty. Had text: $getCssClasses2" stepKey="assertCssClasses2">
293+
<actualResult type="variable">getCssClasses2</actualResult>
294+
</assertEmpty>
287295
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins2">
288296
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
289297
</actionGroup>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
</actionGroup>
5252
<seeElement selector="{{HeadingOnStage.headingPlaceholder(PageBuilderHeadingTypeDefaultProperty.value, 'Edit Heading Text', '1')}}" stepKey="waitForStageHeadingText"/>
5353
<grabValueFrom selector="{{HeadingOnStage.headingOnStage(PageBuilderHeadingTypeDefaultProperty.value, '1')}}" stepKey="getHeadingText"/>
54-
<assertEmpty actual="getHeadingText" actualType="variable" message="Heading has text: getHeadingText" stepKey="assertGetTextFromHeadingTextAttribute"/>
54+
<assertEmpty message="Heading has text: getHeadingText" stepKey="assertGetTextFromHeadingTextAttribute">
55+
<actualResult type="variable">getHeadingText</actualResult>
56+
</assertEmpty>
5557
<dontSeeElement selector="{{HeadingOnStage.headingTypeToolbar('1',PageBuilderHeadingTypeProperty_H1.toolbar)}}" stepKey="dontSeeH1InToolbar"/>
5658
<dontSeeElement selector="{{HeadingOnStage.headingTypeToolbar('1',PageBuilderHeadingTypeProperty_H2.toolbar)}}" stepKey="dontSeeH2InToolbar"/>
5759
<dontSeeElement selector="{{HeadingOnStage.headingTypeToolbar('1',PageBuilderHeadingTypeProperty_H3.toolbar)}}" stepKey="dontSeeH3InToolbar"/>

0 commit comments

Comments
 (0)