Skip to content

Commit dddb5fe

Browse files
engcom-Dashengcom-Dash
authored
Merge branch '2.4-develop' into replace-deprecated-escaper
2 parents a8da4d5 + a947b30 commit dddb5fe

12 files changed

+210
-54
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminDisableViewProductReportActionGroup.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminDisableViewProductReportActionGroup">
12+
<annotations>
13+
<description>Admin disables most view products report in configuration</description>
14+
</annotations>
15+
<magentoCLI command="config:set {{AdminDisableReportConfigData.path}} {{AdminDisableReportConfigData.value}}" stepKey="setReportAsDisable"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminEnableViewProductReportActionGroup.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminEnableViewProductReportActionGroup">
12+
<annotations>
13+
<description>Admin enables most view products report in configuration</description>
14+
</annotations>
15+
<magentoCLI command="config:set {{AdminEnableReportConfigData.path}} {{AdminEnableReportConfigData.value}}" stepKey="setReportAsEnable"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/Data/AdminMenuData.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<data key="pageTitle">Dashboard</data>
2323
<data key="title">Dashboard</data>
2424
<data key="dataUiId">magento-backend-dashboard</data>
25+
<data key="message">Chart is disabled</data>
2526
</entity>
2627
<entity name="AdminMenuStores">
2728
<data key="pageTitle">Stores</data>

‎app/code/Magento/Backend/Test/Mftf/Data/AdminWebConfigData.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,12 @@
1616
<data key="path">web/seo/use_rewrites</data>
1717
<data key="value">0</data>
1818
</entity>
19+
<entity name="AdminEnableReportConfigData">
20+
<data key="path">reports/options/enabled</data>
21+
<data key="value">1</data>
22+
</entity>
23+
<entity name="AdminDisableReportConfigData">
24+
<data key="path">reports/options/enabled</data>
25+
<data key="value">0</data>
26+
</entity>
1927
</entities>

‎app/code/Magento/Backend/Test/Mftf/Section/AdminDashboardSection.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,14 @@
1919
<element name="dashboardTotals" type="text" selector="//*[@class='dashboard-totals-label' and contains(text(), '{{columnName}}')]/../*[@class='dashboard-totals-value']" parameterized="true"/>
2020
<element name="productInBestsellers" type="text" selector="#productsOrderedGrid_table td.col-product.col-name"/>
2121
<element name="dashboardButtonReloadData" type="button" selector=".action-primary[title='Reload Data'][type='submit']"/>
22+
<element name="productTab" type="button" selector="//*[@class='data-grid-th no-link col-name']" timeout="30"/>
23+
<element name="priceTab" type="button" selector="//*[@class='data-grid-th no-link col-price']" timeout="30"/>
24+
<element name="viewsTab" type="button" selector="//*[@class='data-grid-th col-views no-link col-views']" timeout="30"/>
25+
<element name="productName" type="text" selector="//td[contains(text(), '{{columnName}}')]" parameterized="true"/>
26+
<element name="productPrice" type="input" selector="//td[contains(text(), '{{productName}}')]//ancestor::td/following-sibling::td[contains(@class,' col-price a-right ')]" parameterized="true"/>
27+
<element name="productViews" type="input" selector="//td[contains(text(), '{{productName}}')]//ancestor::td/following-sibling::td[contains(@class,' col-views col-views last')]" parameterized="true"/>
28+
<element name="mostViewProductsTab" type="button" selector="//*[contains(@class, 'ui-state-default ui-corner-top') and contains(@aria-labelledby, 'grid_tab_reviewed_products')]" timeout="30"/>
29+
<element name="dashboardChart" type="text" selector="//*[@class='dashboard-diagram-disabled' and contains(text(), '{{columnName}}')]" parameterized="true"/>
2230
</section>
2331
</sections>
32+

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
<before>
2323
<!-- Login as Admin -->
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
25-
2625
<!-- Create Default Category -->
2726
<createData entity="_defaultCategory" stepKey="createCategory"/>
28-
2927
<!-- Create an attribute with two options to be used in the first child product -->
3028
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
3129
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
@@ -34,126 +32,104 @@
3432
<createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
3533
<requiredEntity createDataKey="createConfigProductAttribute"/>
3634
</createData>
37-
3835
<!-- Add the attribute just created to default attribute set -->
3936
<createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
4037
<requiredEntity createDataKey="createConfigProductAttribute"/>
4138
</createData>
42-
4339
<!-- Get the first option of the attribute created -->
4440
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
4541
<requiredEntity createDataKey="createConfigProductAttribute"/>
4642
</getData>
47-
4843
<!-- Get the second option of the attribute created -->
4944
<getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
5045
<requiredEntity createDataKey="createConfigProductAttribute"/>
5146
</getData>
52-
5347
<!-- Create Configurable product -->
5448
<createData entity="BaseConfigurableProduct" stepKey="createConfigProduct">
5549
<requiredEntity createDataKey="createCategory"/>
5650
</createData>
57-
5851
<!-- Create a simple product and give it the attribute with the first option -->
5952
<createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
6053
<requiredEntity createDataKey="createConfigProductAttribute"/>
6154
<requiredEntity createDataKey="getConfigAttributeOption1"/>
6255
</createData>
63-
6456
<!--Create a simple product and give it the attribute with the second option -->
6557
<createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
6658
<requiredEntity createDataKey="createConfigProductAttribute"/>
6759
<requiredEntity createDataKey="getConfigAttributeOption2"/>
6860
</createData>
69-
7061
<!-- Create the configurable product -->
7162
<createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
7263
<requiredEntity createDataKey="createConfigProduct"/>
7364
<requiredEntity createDataKey="createConfigProductAttribute"/>
7465
<requiredEntity createDataKey="getConfigAttributeOption1"/>
7566
<requiredEntity createDataKey="getConfigAttributeOption2"/>
7667
</createData>
77-
7868
<!-- Add the first simple product to the configurable product -->
7969
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
8070
<requiredEntity createDataKey="createConfigProduct"/>
8171
<requiredEntity createDataKey="createConfigChildProduct1"/>
8272
</createData>
83-
8473
<!-- Add the second simple product to the configurable product -->
8574
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
8675
<requiredEntity createDataKey="createConfigProduct"/>
8776
<requiredEntity createDataKey="createConfigChildProduct2"/>
8877
</createData>
89-
9078
<!-- ConfigProduct -->
9179
<!-- Go to Product Page (ConfigProduct) -->
9280
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToConfigProduct">
9381
<argument name="productId" value="$$createConfigProduct.id$$"/>
9482
</actionGroup>
95-
9683
<!--Switch to 'Default Store View' scope and open product page-->
9784
<actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="SwitchDefaultStoreViewForConfigProduct">
9885
<argument name="storeViewName" value="'Default Store View'"/>
9986
</actionGroup>
100-
10187
<!-- Add images for ConfigProduct -->
10288
<actionGroup ref="AddProductImageActionGroup" stepKey="addConfigProductMagento3">
10389
<argument name="image" value="Magento3"/>
10490
</actionGroup>
105-
10691
<actionGroup ref="AddProductImageActionGroup" stepKey="addConfigProductTestImageAdobe">
10792
<argument name="image" value="TestImageAdobe"/>
10893
</actionGroup>
10994
<actionGroup ref="AdminAssignImageBaseRoleActionGroup" stepKey="assignTestImageAdobeBaseRole">
11095
<argument name="image" value="TestImageAdobe"/>
11196
</actionGroup>
112-
11397
<!-- Save changes fot ConfigProduct -->
11498
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveConfigProductProduct"/>
115-
11699
<!-- ChildProduct1 -->
117100
<!-- Go to Product Page (ChildProduct1) -->
118101
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToChildProduct1">
119102
<argument name="productId" value="$$createConfigChildProduct1.id$$"/>
120103
</actionGroup>
121-
122104
<!--Switch to 'Default Store View' scope and open product page-->
123105
<actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="SwitchDefaultStoreViewForChildProduct1">
124106
<argument name="storeViewName" value="'Default Store View'"/>
125107
</actionGroup>
126-
127108
<!-- Add images for ChildProduct1 -->
128109
<actionGroup ref="AddProductImageActionGroup" stepKey="addChildProduct1ProductImage">
129-
<argument name="image" value="ProductImage"/>
110+
<argument name="image" value="TestImageNew"/>
130111
</actionGroup>
131112
<actionGroup ref="AddProductImageActionGroup" stepKey="addChildProduct1Magento2">
132113
<argument name="image" value="Magento2"/>
133114
</actionGroup>
134115
<actionGroup ref="AdminAssignImageRolesActionGroup" stepKey="assignMagento2Role">
135116
<argument name="image" value="Magento2"/>
136117
</actionGroup>
137-
138118
<!-- Save changes fot ChildProduct1 -->
139119
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveChildProduct1Product"/>
140-
141120
<!-- ChildProduct2 -->
142121
<!-- Go to Product Page (ChildProduct2) -->
143122
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToChildProduct2">
144123
<argument name="productId" value="$$createConfigChildProduct2.id$$"/>
145124
</actionGroup>
146-
147125
<!--Switch to 'Default Store View' scope and open product page-->
148126
<actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="SwitchDefaultStoreViewForChildProduct2">
149127
<argument name="storeViewName" value="'Default Store View'"/>
150128
</actionGroup>
151-
152129
<!-- Add image for ChildProduct2 -->
153130
<actionGroup ref="AddProductImageActionGroup" stepKey="addChildProduct2TestImageNew">
154131
<argument name="image" value="TestImageNew"/>
155132
</actionGroup>
156-
157133
<!-- Save changes fot ChildProduct2 -->
158134
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveChildProduct2Product"/>
159135
</before>
@@ -165,65 +141,52 @@
165141
<deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
166142
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
167143
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
168-
169144
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
170145
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
171146
<argument name="indices" value=""/>
172147
</actionGroup>
173148
</after>
174-
175149
<!-- Open ConfigProduct in Store Front Page -->
176150
<amOnPage url="$$createConfigProduct.custom_attributes[url_key]$$.html" stepKey="openProductInStoreFront"/>
177151
<waitForPageLoad stepKey="waitForProductToLoad"/>
178-
179152
<!-- Check fotorama thumbnail images (no selected options) -->
180153
<actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeMagento3ForNoOption">
181154
<argument name="fileName" value="{{Magento3.filename}}"/>
182155
</actionGroup>
183-
184156
<actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeActiveTestImageAdobeForNoOption">
185157
<argument name="fileName" value="{{TestImageAdobe.filename}}"/>
186158
</actionGroup>
187-
188159
<!-- Select first option -->
189160
<actionGroup ref="StorefrontProductPageSelectDropDownOptionValueActionGroup" stepKey="selectFirstOptionValue">
190161
<argument name="attributeLabel" value="$$createConfigProductAttribute.default_frontend_label$$"/>
191162
<argument name="optionLabel" value="$$getConfigAttributeOption1.label$$"/>
192163
</actionGroup>
193-
194164
<!-- Check fotorama thumbnail images (first option selected) -->
195165
<actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeMagento3ForFirstOption">
196166
<argument name="fileName" value="{{Magento3.filename}}"/>
197167
</actionGroup>
198-
199168
<actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeTestImageAdobeForFirstOption">
200169
<argument name="fileName" value="{{TestImageAdobe.filename}}"/>
201170
</actionGroup>
202-
203171
<actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeProductImageForFirstOption">
204-
<argument name="fileName" value="{{ProductImage.filename}}"/>
172+
<argument name="fileName" value="{{TestImageNew.filename}}"/>
205173
</actionGroup>
206-
207174
<!-- Check active fotorama thumbnail image (first option selected) -->
208175
<actionGroup ref="StorefrontAssertActiveProductImageActionGroup" stepKey="seeActiveMagento2ForFirstOption">
209176
<argument name="fileName" value="{{Magento2.filename}}"/>
210177
</actionGroup>
211-
212178
<!-- Select second option -->
213179
<actionGroup ref="StorefrontProductPageSelectDropDownOptionValueActionGroup" stepKey="selectSecondOptionValue">
214180
<argument name="attributeLabel" value="$$createConfigProductAttribute.default_frontend_label$$"/>
215181
<argument name="optionLabel" value="$$getConfigAttributeOption2.label$$"/>
216182
</actionGroup>
217-
218183
<!-- Check fotorama thumbnail images (second option selected) -->
219184
<actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeMagento3ForSecondOption">
220185
<argument name="fileName" value="{{Magento3.filename}}"/>
221186
</actionGroup>
222-
223187
<actionGroup ref="StorefrontAssertFotoramaImageAvailabilityActionGroup" stepKey="seeTestImageAdobeForSecondOption">
224188
<argument name="fileName" value="{{TestImageAdobe.filename}}"/>
225189
</actionGroup>
226-
227190
<!-- Check active fotorama thumbnail image (second option selected) -->
228191
<actionGroup ref="StorefrontAssertActiveProductImageActionGroup" stepKey="seeActiveTestImageNewForSecondOption">
229192
<argument name="fileName" value="{{TestImageNew.filename}}"/>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@
7373

7474
<!-- Add images to configurable product attribute options -->
7575
<actionGroup ref="AddUniqueImageToConfigurableProductOptionActionGroup" stepKey="addImageToConfigurableProductOptionOne">
76-
<argument name="image" value="ImageUpload"/>
76+
<argument name="image" value="TestImageNew"/>
7777
<argument name="frontend_label" value="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"/>
7878
<argument name="label" value="$$getConfigAttributeOption1CreateConfigurableProduct.label$$"/>
7979
</actionGroup>
8080
<actionGroup ref="AddUniqueImageToConfigurableProductOptionActionGroup" stepKey="addImageToConfigurableProductOptionTwo">
81-
<argument name="image" value="ImageUpload_1"/>
81+
<argument name="image" value="TestImageAdobe"/>
8282
<argument name="frontend_label" value="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"/>
8383
<argument name="label" value="$$getConfigAttributeOption2CreateConfigurableProduct.label$$"/>
8484
</actionGroup>
8585
<actionGroup ref="AddUniqueImageToConfigurableProductOptionActionGroup" stepKey="addImageToConfigurableProductOptionThree">
86-
<argument name="image" value="ImageUpload3"/>
86+
<argument name="image" value="MagentoLogo"/>
8787
<argument name="frontend_label" value="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"/>
8888
<argument name="label" value="{{colorDefaultProductAttribute1.name}}"/>
8989
</actionGroup>
@@ -123,19 +123,19 @@
123123

124124
<actionGroup ref="AssertOptionImageAndPriceInStorefrontProductActionGroup" stepKey="assertFirstOptionImageAndPriceInStorefrontProductPage">
125125
<argument name="label" value="$$getConfigAttributeOption1CreateConfigurableProduct.label$$"/>
126-
<argument name="image" value="{{ImageUpload.filename}}"/>
126+
<argument name="image" value="{{TestImageNew.filename}}"/>
127127
<argument name="price" value="10"/>
128128
</actionGroup>
129129

130130
<actionGroup ref="AssertOptionImageAndPriceInStorefrontProductActionGroup" stepKey="assertSecondOptionImageAndPriceInStorefrontProductPage">
131131
<argument name="label" value="$$getConfigAttributeOption2CreateConfigurableProduct.label$$"/>
132-
<argument name="image" value="{{ImageUpload_1.filename}}"/>
132+
<argument name="image" value="{{TestImageAdobe.filename}}"/>
133133
<argument name="price" value="20"/>
134134
</actionGroup>
135135

136136
<actionGroup ref="AssertOptionImageAndPriceInStorefrontProductActionGroup" stepKey="assertThirdOptionImageAndPriceInStorefrontProductPage">
137137
<argument name="label" value="{{colorDefaultProductAttribute1.name}}"/>
138-
<argument name="image" value="{{ImageUpload3.filename}}"/>
138+
<argument name="image" value="{{MagentoLogo.filename}}"/>
139139
<argument name="price" value="30"/>
140140
</actionGroup>
141141
</test>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryExpandFilterActionGroup.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2020 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -12,7 +12,7 @@
1212
<annotations>
1313
<description>Expand media gallery filter by clicking on button</description>
1414
</annotations>
15-
15+
<waitForElementClickable selector="{{AdminEnhancedMediaGalleryFiltersSection.filtersButton}}" stepKey="waitForExpandFilter"/>
1616
<click selector="{{AdminEnhancedMediaGalleryFiltersSection.filtersButton}}" stepKey="expandFilter"/>
1717
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
1818
</actionGroup>

0 commit comments

Comments
 (0)