Skip to content

Commit 18b712b

Browse files
krissyhiserotekrissyhiserote
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-91307-clean-up-typescript-errors
2 parents 2224ed5 + 103ab84 commit 18b712b

Some content is hidden

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

52 files changed

+1010
-122
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@
520520
<argument name="property" defaultValue=""/>
521521
</arguments>
522522
<waitForElement selector="{{PageBuilderActionsSection.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElement" />
523-
<waitForElementVisible selector="{{PageBuilderActionsSection.editFormUploadedImageSource(property.section, property.fieldName, property.baseFileName, property.fileType)}}" stepKey="seeUploadedFile"/>
523+
<waitForElementVisible selector="{{PageBuilderActionsSection.editFormUploadedImageSource(property.section, property.fieldName, property.fileName, property.fileType)}}" stepKey="seeUploadedFile"/>
524524
</actionGroup>
525525
<actionGroup name="seeNoImageUploadedOnSlideOut">
526526
<arguments>

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="addImageToStage">
11+
<arguments>
12+
<argument name="property"/>
13+
</arguments>
14+
<comment userInput="Attach image A to PageBuilder stage" stepKey="commentAttach"/>
15+
<attachFile userInput="{{property.value}}" selector="{{ImageOnStage.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
16+
<waitForPageLoad stepKey="waitForPageLoad"/>
17+
<waitForElementVisible selector="{{ImageOnStage.imagePreview}}" stepKey="waitForImagePreview"/>
18+
<waitForElementVisible selector="{{ImageOnStage.imageSourceOnStage(property.fileName)}}" stepKey="waitForImageSource"/>
19+
</actionGroup>
20+
<actionGroup name="verifyUploadImageButtons">
21+
<arguments>
22+
<argument name="contentType"/>
23+
<argument name="section"/>
24+
</arguments>
25+
<comment userInput="Hover uploaded image to check Upload New Image button and Select From Gallery button" stepKey="commentHover"/>
26+
<moveMouseOver selector="{{PageBuilderActionsSection.contentTypeInStage(contentType.role)}}" x="10" y="0" stepKey="onMouseOverBannerContentTypeStage"/>
27+
<waitForElementVisible selector="{{section.uploadNewImageBtn}}" stepKey="waitForUploadNewImageBtn" />
28+
<waitForElementVisible selector="{{section.selectFromGalleryImageBtn}}" stepKey="seeSelectFromGalleryBtn2" />
29+
</actionGroup>
30+
<actionGroup name="verifyImageOnSlideout">
31+
<arguments>
32+
<argument name="property"/>
33+
</arguments>
34+
<comment userInput="Verify image A display on preview of slide-out" stepKey="commentVerifyImage"/>
35+
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageName(property.value)}}" stepKey="seeImageNameOnPreview"/>
36+
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(property.fileName)}}" stepKey="seeMainImageSource"/>
37+
</actionGroup>
38+
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</arguments>
5858
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForRow"/>
5959
<waitForElementVisible selector="{{page.backgroundColor(index, backgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>
60-
<waitForElementVisible selector="{{page.backgroundImage(index, backgroundImage.baseFileName, backgroundImage.fileType)}}" stepKey="waitForBackgroundImage"/>
60+
<waitForElementVisible selector="{{page.backgroundImage(index, backgroundImage.fileName, backgroundImage.fileType)}}" stepKey="waitForBackgroundImage"/>
6161
<waitForElementVisible selector="{{page.backgroundPosition(index, backgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
6262
<waitForElementVisible selector="{{page.backgroundSize(index, backgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
6363
<waitForElementVisible selector="{{page.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
@@ -76,7 +76,7 @@
7676
</arguments>
7777
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForRow"/>
7878
<waitForElementVisible selector="{{page.backgroundColor(index, backgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>
79-
<waitForElementVisible selector="{{page.parallaxBackgroundImage(index, backgroundImage.baseFileName, backgroundImage.fileType)}}" stepKey="waitForBackgroundImage"/>
79+
<waitForElementVisible selector="{{page.parallaxBackgroundImage(index, backgroundImage.fileName, backgroundImage.fileType)}}" stepKey="waitForBackgroundImage"/>
8080
<waitForElementVisible selector="{{page.backgroundPosition(index, backgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
8181
<waitForElementVisible selector="{{page.backgroundSize(index, backgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
8282
<waitForElementVisible selector="{{page.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<data key="name">Background Image</data>
2020
<data key="section">background</data>
2121
<data key="fieldName">background_image</data>
22-
<data key="value">magento.jpg</data>
23-
<data key="fileName">magento</data>
22+
<data key="value">magento3.jpg</data>
23+
<data key="fileName">magento3</data>
2424
<data key="fileType">jpg</data>
2525
<data key="path">wysiwyg/magento</data>
2626
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<data key="section">background</data>
101101
<data key="fieldName">background_image</data>
102102
<data key="value">magento.jpg</data>
103-
<data key="baseFileName">magento</data>
103+
<data key="fileName">magento</data>
104104
<data key="fileType">jpg</data>
105105
<data key="path">wysiwyg/magento</data>
106106
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@
1414
<data key="fieldName">slide_name</data>
1515
<data key="value">Slide 1 Name</data>
1616
</entity>
17+
<entity name="PageBuilderSliderBackgroundImageProperty" type="pagebuilder_background_image_property">
18+
<data key="name">Background Image</data>
19+
<data key="section">background</data>
20+
<data key="fieldName">background_image</data>
21+
<data key="value">magento3.jpg</data>
22+
<data key="fileName">magento3</data>
23+
<data key="fileType">jpg</data>
24+
<data key="path">wysiwyg/magento</data>
25+
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
26+
</entity>
1727
<entity name="PageBuilderSlideMinHeight" type="pagebuilder_slide_property">
1828
<data key="name">Minimum Height</data>
1929
<data key="section">appearance_fieldset</data>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@
9191
<element name="editFormUploadedImage" type="button" selector="//div[@data-index='{{arg1}}']/descendant::*[@name='{{arg2}}']//..//..//img" parameterized="true"/>
9292
<element name="editFormNoUploadedImage" type="button" selector="//span[text()='{{arg1}}']//parent::label//following-sibling::div//p[text()='Browse to find or drag image here']" parameterized="true"/>
9393
<element name="editFormUploadedImageSource" type="button" selector="//div[@data-index='{{arg1}}']/descendant::*[@name='{{arg2}}']//..//..//img[contains(@src,'{{arg3}}') and contains(@src,'{{arg4}}')]" parameterized="true"/>
94+
<element name="uploadLocalImageBtn" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
95+
<element name="uploadNewImageBtn" type="button" selector="//label[text()='Upload Image']" />
96+
<element name="selectFromGalleryImageBtn" type="button" selector="//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']"/>
97+
<element name="imageSourceOnFrontEnd" type="button" selector="//div[not(contains(@class, 'pagebuilder-mobile-hidden')) and contains(@style, '{{var1}}')]" parameterized="true" />
9498
</section>
9599
<section name="AdvancedForm">
96100
<element name="sectionName" type="button" selector="//div[@data-index='advanced']"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<element name="imagePreview" type="button" selector="//div[@class='preview-image-container']" />
5050
<element name="imageSourceOnStage" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true" />
5151
<element name="selectFromGalleryBtn" type="button" selector="//figure//div[@class='file-uploader-area']//label[text()='Select from Gallery']"/>
52-
<element name="selectFromGalleryImageBtn" type="button" selector="//figure//div[@class='pagebuilder-options-wrapper']//label[text()='Select from Gallery']"/>
52+
<element name="selectFromGalleryImageBtn" type="button" selector="//ul[@class='pagebuilder-options-links']//label[text()='Select from Gallery']"/>
5353
<element name="uploadImageBtn" type="button" selector="//div[@class='pagebuilder-image-uploader-container']//label[text()='Upload Image']" />
5454
<element name="uploadNewImageBtn" type="button" selector="//label[text()='Upload New Image']" />
5555
<!-- Advanced Configuration -->

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="RowOnBackend">
12+
<element name="selectFromGallery" type="button" selector="//label[text()='Select from Gallery']"/>
1213
<element name="backgroundSectionName" type="button" selector="//div[@data-index='background']"/>
1314
<!-- Background Configuration -->
1415
<element name="backgroundRepeat" type="button" selector="[name='background-repeat']"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
</section>
132132
<section name="SlideOnBackend">
133133
<element name="optionTitle" type="button" selector=".pagebuilder-slider .navigation-dot.active .option-title"/>
134-
<element name="collageOverlay" type="button" selector=".pagebuilder-collage-overlay"/>
134+
<element name="collageOverlayGeneral" type="button" selector=".pagebuilder-collage-overlay"/>
135135
<element name="slideAppearancePoster" type="button" selector="[data-slick-index='{{arg1}}'] .pagebuilder-poster-content" parameterized="true"/>
136136
<element name="slideAppearanceCollageLeft" type="button" selector="[data-slick-index='{{arg1}}'] .pagebuilder-slide [style*='40px calc(50% + 40px) 40px 40px']" parameterized="true"/>
137137
<element name="slideAppearanceCollageCenter" type="button" selector="[data-slick-index='{{arg1}}'] .pagebuilder-slide [style*='40px calc(25% + 40px)']" parameterized="true"/>

0 commit comments

Comments
 (0)