Skip to content

Commit 37742e4

Browse files
eug123eug123
committed
Merge remote-tracking branch 'origin/PB-719' into PB-1145
2 parents a1137fa + f0afa8e commit 37742e4

File tree

41 files changed

+24
-102
lines changed

Some content is hidden

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

41 files changed

+24
-102
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/EnterHeadingOnStageActionGroup.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
<arguments>
1212
<argument name="index" defaultValue="1" type="string"/>
1313
<argument name="headingType" defaultValue="PageBuilderHeadingTypeDefaultProperty"/>
14-
<argument name="headingText" defaultValue="PageBuilderHeadingTextProperty"/>
1514
<argument name="headingAlignment" defaultValue="PageBuilderHeadingAlignmentProperty_left"/>
16-
<argument name="headingText" defaultValue="PageBuilderHeadingTextProperty"/>
15+
<argument name="headingText" defaultValue="{{PageBuilderHeadingTextProperty.value}}" type="string"/>
1716
</arguments>
1817
<comment userInput="Edit heading text inline on stage" stepKey="commentEditHeading"/>
19-
<pressKey selector="{{HeadingOnStage.headingEditableText(index)}}" userInput="{{headingText.value}}" stepKey="enterHeadingText"/>
18+
<pressKey selector="{{HeadingOnStage.headingEditableText(index)}}" userInput="{{headingText}}" stepKey="enterHeadingText"/>
2019
<waitForPageLoad stepKey="waitForToolbar" time="30"/>
2120
<waitForElementVisible selector="{{HeadingOnStage.headingTypeToolbar(index, headingType.toolbar)}}" stepKey="waitForToolbarVisible"/>
2221
<click selector="{{HeadingOnStage.headingTypeToolbar(index, headingType.toolbar)}}" stepKey="clickHeadingType"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageFullWidthLayoutTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@
5252
<actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingOntoStage">
5353
<argument name="contentType" value="PageBuilderHeadingContentType"/>
5454
</actionGroup>
55-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
56-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
57-
</actionGroup>
55+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage"/>
5856
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
5957
<!-- Use Full Width layout -->
6058
<comment userInput="Set Layout to Page - Full Width" stepKey="commentSetLayout"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithInvalidFullWidthLayoutTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@
5353
<actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingOntoStage">
5454
<argument name="contentType" value="PageBuilderHeadingContentType"/>
5555
</actionGroup>
56-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
57-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
58-
</actionGroup>
56+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage"/>
5957
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6058
<!-- Use Category - Full Width layout -->
6159
<comment userInput="Set Layout to Category - Full Width" stepKey="commentSetLayout"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAndInvalidPageLayoutTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@
5656
<actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingOntoStage">
5757
<argument name="contentType" value="PageBuilderHeadingContentType"/>
5858
</actionGroup>
59-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
60-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
61-
</actionGroup>
59+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage"/>
6260
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6361
<!-- Set Layout to Page - Full Width -->
6462
<comment userInput="Set Layout to Page - Full Width" stepKey="commentSetLayout"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAppearanceTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@
5353
<actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingOntoStage">
5454
<argument name="contentType" value="PageBuilderHeadingContentType"/>
5555
</actionGroup>
56-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
57-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
58-
</actionGroup>
56+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage"/>
5957
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6058
<!-- Set Category Layout and Save -->
6159
<actionGroup ref="SetLayoutActionGroup" stepKey="setFullWidthLayout">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@
5555
</actionGroup>
5656
<!-- Add heading to stage -->
5757
<comment userInput="Add heading to stage" stepKey="commentAddHeadingToStage"/>
58-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
59-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
60-
</actionGroup>
58+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage"/>
6159
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6260
<!-- Use Full Width layout -->
6361
<comment userInput="Set Layout to Category - Full Width" stepKey="commentSetLayout"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionAndInvalidLayoutTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@
6565
<actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingOntoStage">
6666
<argument name="contentType" value="PageBuilderHeadingContentType"/>
6767
</actionGroup>
68-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
69-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
70-
</actionGroup>
68+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage"/>
7169
<click selector="{{PageBuilderStage.exitFullScreen}}" stepKey="exitPageBuilderFullScreen"/>
7270
<waitForPageLoad stepKey="waitForPageLoadExitFullScreen"/>
7371
<!-- Set Layout to Category - Full Width -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@
6464
</actionGroup>
6565
<!-- Add heading to stage -->
6666
<comment userInput="Add heading to stage" stepKey="commentAddHeadingToStage"/>
67-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
68-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
69-
</actionGroup>
67+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage"/>
7068
<click selector="{{PageBuilderStage.exitFullScreen}}" stepKey="exitPageBuilderFullScreen"/>
7169
<waitForPageLoad stepKey="waitForPageLoadExitFullScreen"/>
7270
<!-- Use Full Width layout -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@
5959
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
6060
<argument name="containerTargetIndex" value="2"/>
6161
</actionGroup>
62-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
63-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
64-
</actionGroup>
62+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage"/>
6563
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
6664
<argument name="index" value="1"/>
6765
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderWorksForEachCatalogProductAttributeTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@
8585
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
8686
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
8787
</actionGroup>
88-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
89-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
90-
</actionGroup>
88+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage"/>
9189
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
9290
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
9391
</actionGroup>

0 commit comments

Comments
 (0)