Skip to content

Commit d5b4db8

Browse files
sidolovsidolov
authored
Merge pull request #292 from magento-gl/GL_PR_Arrows_Jan_19_2024
Arrows Team - Feature delivery
2 parents fc6c7a3 + 342d348 commit d5b4db8

File tree

27 files changed

+106
-32
lines changed

27 files changed

+106
-32
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<argument name="property"/>
1313
</arguments>
1414
<comment userInput="Attach image A to PageBuilder stage" stepKey="commentAttach"/>
15-
<attachFile userInput="{{property.value}}" selector="{{ImageOnStageWithoutImageUploaded.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
15+
<attachFile userInput="{{property.value}}" selector="{{ImageOnStageWithoutImageUploaded.attachImageBtnWithUploaderId}}" stepKey="attachImageFileOnStage"/>
1616
<waitForPageLoad stepKey="waitForPageLoad"/>
1717
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imagePreview}}" stepKey="waitForImagePreview"/>
1818
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imageSource(property.fileName)}}" stepKey="waitForImageSource"/>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="validateSlideOutPanelFieldHelperTextWithUploaderId">
11+
<annotations>
12+
<description>Validates the helper text for a field on the edit panel form.</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="property"/>
16+
</arguments>
17+
<waitForElement time="2" selector="{{EditPanelForm.panelFieldHelperTextWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForElement"/>
18+
<see userInput="{{property.helperText}}" selector="{{EditPanelForm.panelFieldHelperTextWithUploaderId(property.section, property.fieldName)}}" stepKey="seeHelperText"/>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="validateSlideOutPanelFieldTooltipWithUploaderId">
11+
<annotations>
12+
<description>Validates the tooltip for a field on the edit panel form.</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="property"/>
16+
</arguments>
17+
<waitForElement time="2" selector="{{EditPanelForm.panelFieldTooltipWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForTooltip"/>
18+
<moveMouseOver selector="{{EditPanelForm.panelFieldTooltipWithUploaderId(property.section, property.fieldName)}}" stepKey="mouseOverTooltip"/>
19+
<waitForElementVisible selector="{{EditPanelForm.panelFieldTooltipContentWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForTooltipContentVisible"/>
20+
<see userInput="{{property.tooltipText}}" selector="{{EditPanelForm.panelFieldTooltipContentWithUploaderId(property.section, property.fieldName)}}" stepKey="seeTooltipContent"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="validateSlideOutPanelFieldWithUploaderId">
11+
<arguments>
12+
<argument name="property"/>
13+
</arguments>
14+
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
15+
<see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
16+
<seeElementInDOM selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="seePropertyControl"/>
17+
</actionGroup>
18+
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<arguments>
1616
<argument name="property"/>
1717
</arguments>
18-
<attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="attachBackgroundImageFile"/>
18+
<attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="attachBackgroundImageFile"/>
1919
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
20-
<waitForElementVisible selector="{{EditPanelForm.editFormUploadedImage(property.section, property.fieldName)}}" stepKey="waitForImageUpload"/>
20+
<waitForElementVisible selector="{{EditPanelForm.editFormUploadedImageWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForImageUpload"/>
2121
</actionGroup>
2222
</actionGroups>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<arguments>
1616
<argument name="property"/>
1717
</arguments>
18-
<waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForImageElement"/>
19-
<attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="attachImageFile"/>
18+
<waitForElement selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForImageElement"/>
19+
<attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="attachImageFile"/>
2020
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
21-
<waitForElementVisible time="10" selector="{{EditPanelForm.editFormUploadedImage(property.section, property.fieldName)}}" stepKey="waitForImageUploaded"/>
21+
<waitForElementVisible time="10" selector="{{EditPanelForm.editFormUploadedImageWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForImageUploaded"/>
2222
</actionGroup>
2323
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<arguments>
1212
<argument name="property"/>
1313
</arguments>
14-
<attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="attachBackgroundImageFile"/>
14+
<attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="attachBackgroundImageFile"/>
1515
<waitForPageLoad stepKey="waitForPageLoad"/>
1616
<waitForElementVisible selector="{{EditPanelForm.invalidUploadTitle}}" stepKey="waitForInvalidUploadTitle"/>
1717
<waitForElementVisible selector="{{EditPanelForm.invalidUploadMessage(property.errorMessage)}}" stepKey="waitForInvalidUploadMessage"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<arguments>
1212
<argument name="property"/>
1313
</arguments>
14-
<waitForElementVisible selector="{{EditPanelForm.selectFromGalleryBtn(property.section, property.fieldName)}}" stepKey="waitForSelectFromGalleryBtn"/>
15-
<click selector="{{EditPanelForm.selectFromGalleryBtn(property.section, property.fieldName)}}" stepKey="clickSelectFromGalleryBtn"/>
14+
<waitForElementVisible selector="{{EditPanelForm.selectFromGalleryBtnWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForSelectFromGalleryBtn"/>
15+
<click selector="{{EditPanelForm.selectFromGalleryBtnWithUploaderId(property.section, property.fieldName)}}" stepKey="clickSelectFromGalleryBtn"/>
1616
<waitForPageLoad stepKey="waitForPageLoad"/>
1717
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
1818
</actionGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<arguments>
1212
<argument name="property"/>
1313
</arguments>
14-
<waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElement"/>
15-
<waitForElementVisible selector="{{EditPanelForm.editFormUploadedImageSource(property.section, property.fieldName, property.fileName, property.extension)}}" stepKey="seeUploadedFile"/>
14+
<waitForElement selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForElement"/>
15+
<waitForElementVisible selector="{{EditPanelForm.editFormUploadedImageSourceWithUploaderId(property.section, property.fieldName, property.fileName, property.extension)}}" stepKey="seeUploadedFile"/>
1616
</actionGroup>
1717
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<arguments>
1212
<argument name="property"/>
1313
</arguments>
14-
<waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElement"/>
14+
<waitForElement selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForElement"/>
1515
<waitForElementVisible selector="{{EditPanelForm.editFormNoUploadedImage(property.name)}}" stepKey="seeNoUploadedFile"/>
1616
</actionGroup>
1717
</actionGroups>

0 commit comments

Comments
 (0)