Skip to content

Commit 157fb80

Browse files
glo71317glo71317
committedFeb 27, 2025
Merge remote-tracking branch 'origin/2.4-develop' into aprilrelease
·
2.4.8
2 parents 4d81f13 + 89b4e2e commit 157fb80

15 files changed

+325
-23
lines changed
 

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/StoreFrontDeleteProductImagesAssignedDifferentRolesTest.xml

+3-3
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 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -77,7 +77,7 @@
7777
<!-- Go to the product page on StoreFront and see the Base image -->
7878
<amOnPage url="{{StorefrontProductPage.url($simpleProductOne.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
7979
<waitForPageLoad stepKey="waitForPageLoad"/>
80-
<seeElement selector="{{StorefrontProductMediaSection.imageFile('/adobe-base')}}" stepKey="seeBaseImageOnProductPage"/>
80+
<seeElement selector="{{StorefrontProductMediaSection.imageFile(TestImageAdobe.filename)}}" stepKey="seeBaseImageOnProductPage"/>
8181
<!-- Go to the category page and see the Small image -->
8282
<amOnPage url="{{StorefrontCategoryPage.url($testCategory.custom_attributes[url_key]$)}}" stepKey="goToCategoryPage"/>
8383
<waitForPageLoad stepKey="waitForPageLoadingToFinish"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml

+4-4
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 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -11,7 +11,7 @@
1111
<entity name="SimpleTerm" type="searchTerm">
1212
<data key="search_query" unique="suffix">Query text</data>
1313
<data key="store_id">Default Store View</data>
14-
<data key="redirect" unique="suffix">http://example.com/</data>
14+
<data key="redirect" unique="suffix">https://example.com/</data>
1515
<data key="display_in_terms">No</data>
1616
</entity>
17-
</entities>
17+
</entities>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToDropdownAttributeActionGroup.xml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="AdminAddOptionsToDropdownAttributeActionGroup">
12+
<annotations>
13+
<description>Adds options to a product attribute of type "dropdown" in the Admin panel.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="optionIndex" type="string" defaultValue="0"/>
17+
<argument name="optionValue" type="string"/>
18+
</arguments>
19+
<click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickOnAddOption"/>
20+
<waitForElementVisible selector="{{AdminNewAttributePanel.optionAdminValue(optionIndex)}}" stepKey="waitForAdminLabel"/>
21+
<fillField selector="{{AdminNewAttributePanel.optionAdminValue(optionIndex)}}" userInput="{{optionValue}}" stepKey="fillAdminLabel"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminRemoveOptionsFromColorAttributeActionGroup.xml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AdminRemoveOptionsFromColorAttributeActionGroup">
12+
<annotations>
13+
<description>Remove options from color attribute</description>
14+
</annotations>
15+
<click stepKey="deleteOption1" selector="{{AdminNewAttributePanel.deleteOptionByName('black')}}"/>
16+
<click stepKey="deleteOption2" selector="{{AdminNewAttributePanel.deleteOptionByName('red')}}"/>
17+
<!-- Save attribute -->
18+
<click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
19+
<waitForPageLoad time="30" stepKey="waitForSaveAttribute"/>
20+
<switchToIFrame stepKey="switchOutOfIFrame"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminUnassignAttributeFromDefaultSetActionGroup.xml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="AdminUnassignAttributeFromDefaultSetActionGroup">
12+
<annotations>
13+
<description>Unassign given attribute from default attribute set</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="ProductAttributeCode" type="string"/>
17+
</arguments>
18+
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetPage"/>
19+
<click selector="{{AdminProductAttributeSetGridSection.resetFilter}}" stepKey="clickResetButton"/>
20+
<fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="Default" stepKey="filterByName"/>
21+
<click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearchBtn"/>
22+
<click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
23+
<waitForPageLoad stepKey="waitForSelectCustomGroup"/>
24+
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute(ProductAttributeCode)}}" selector2="{{AdminProductAttributeSetSection.attribute('manufacturer')}}" stepKey="unassignAttributeFromDefaultAttributeSet"/>
25+
<click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSaveDefaultAttributeSet"/>
26+
</actionGroup>
27+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateCustomAttributeActionGroup.xml

+17
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="CreateCustomAttributeActionGroup">
12+
<arguments>
13+
<argument name="attributeScope" type="string" defaultValue="Store View"/>
14+
</arguments>
15+
<selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="{{attributeScope}}" stepKey="selectAttributeScopeDropdown" after="fillAttributeCode"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontVerifyConfigurableProductImagesActionGroup.xml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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="StorefrontVerifyConfigurableProductImagesActionGroup">
12+
<annotations>
13+
<description>Verify unique image visibility for configurable product option on storefront</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="attributeOption1" type="string"/>
17+
<argument name="attributeOption2" type="string"/>
18+
</arguments>
19+
<selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect(attributeOption1)}}" userInput="{{ConfigurableProduct1.color_option1}}" stepKey="fillColorDownAttributeOption1"/>
20+
<selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect(attributeOption2)}}" userInput="{{ConfigurableProduct1.size_option1}}" stepKey="fillSizeAttributeOption1"/>
21+
<waitForPageLoad time="30" stepKey="waitForPreviewLoadForOptionBlack"/>
22+
<waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(TestImageNew.filename)}}" time="30" stepKey="waitImageToBeLoadedForColorOptionBlack"/>
23+
<selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect(attributeOption1)}}" userInput="{{ConfigurableProduct1.color_option2}}" stepKey="fillColorDownAttributeOption2"/>
24+
<selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect(attributeOption2)}}" userInput="{{ConfigurableProduct1.size_option2}}" stepKey="fillSizeAttributeOption2"/>
25+
<waitForPageLoad time="30" stepKey="waitForPreviewLoadForOptionRed"/>
26+
<waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(MagentoLogo.filename)}}" time="30" stepKey="waitImageToBeLoadedForColorOptionRed"/>
27+
</actionGroup>
28+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml

+15
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,19 @@
123123
<data key="name">API Configurable Export Import Product</data>
124124
<data key="urlKey">api-configurable-export-import-product</data>
125125
</entity>
126+
<entity name="ConfigurableProduct1" type="product">
127+
<data key="name" unique="suffix">conf1</data>
128+
<data key="sku" unique="suffix">conf1</data>
129+
<data key="type_id">configurable</data>
130+
<data key="attribute_set_id">4</data>
131+
<data key="status">1</data>
132+
<data key="quantity">10000</data>
133+
<data key="price">10</data>
134+
<data key="color_label">Color</data>
135+
<data key="size_label">Size</data>
136+
<data key="color_option1">black</data>
137+
<data key="color_option2">red</data>
138+
<data key="size_option1">8</data>
139+
<data key="size_option2">10</data>
140+
</entity>
126141
</entities>

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

+164
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StorefrontConfigurableProductUniqueImageDisplayTest">
11+
<annotations>
12+
<features value="Backend"/>
13+
<stories value="Display unique images for a configurable product on storefront"/>
14+
<title value="Unique images should be displayed on storefront correctly for Configurable product"/>
15+
<description value="Admin should be able to add images for configurable products and unique images should display on storefront correctly based configurable attribute options"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-4825"/>
18+
<group value="catalog"/>
19+
</annotations>
20+
<before>
21+
<!-- Admin Login -->
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
24+
<!-- Goto, Stores > Attributes > Product > Filter by attribute label 'Color' > Edit-->
25+
<actionGroup ref="AdminNavigateToProductAttributeEditPageActionGroup" stepKey="navigateToColorProductAttribute1">
26+
<argument name="ProductAttributeLabel" value="Color"/>
27+
</actionGroup>
28+
<!-- Use the action group to add the 'black' option to the Color attribute -->
29+
<actionGroup ref="AdminAddOptionsToDropdownAttributeActionGroup" stepKey="addOptionBlackForColorAttribute">
30+
<argument name="optionIndex" value="0"/>
31+
<argument name="optionValue" value="{{ConfigurableProduct1.color_option1}}"/>
32+
</actionGroup>
33+
<!-- Use the action group to add the 'red' option to the Color attribute -->
34+
<actionGroup ref="AdminAddOptionsToDropdownAttributeActionGroup" stepKey="addOptionRedForColorAttribute">
35+
<argument name="optionIndex" value="1"/>
36+
<argument name="optionValue" value="{{ConfigurableProduct1.color_option2}}"/>
37+
</actionGroup>
38+
<!-- Save attribute -->
39+
<actionGroup ref="AdminProductAttributeSaveActionGroup" stepKey="saveColorAttribute"/>
40+
41+
<!-- Create new attribute 'Size'-->
42+
<actionGroup ref="CreateCustomAttributeActionGroup" stepKey="createCustomProductAttributeSize">
43+
<argument name="attributeLabel" value="Size"/>
44+
<argument name="attributeCode" value="size"/>
45+
<argument name="valueRequired" value="No"/>
46+
<argument name="adminOption1" value="{{ConfigurableProduct1.size_option1}}"/>
47+
<argument name="adminOption1Value" value="{{ConfigurableProduct1.size_option1}}"/>
48+
<argument name="adminOption2" value="{{ConfigurableProduct1.size_option2}}"/>
49+
<argument name="adminOption2Value" value="{{ConfigurableProduct1.size_option2}}"/>
50+
<argument name="attributeScope" value="Global"/>
51+
</actionGroup>
52+
53+
<!--Crete new category-->
54+
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToCategoryPage"/>
55+
<actionGroup ref="CreateCategoryActionGroup" stepKey="createNewSubcategory">
56+
<argument name="categoryEntity" value="CategoryB"/>
57+
</actionGroup>
58+
</before>
59+
<after>
60+
<!--Delete category-->
61+
<actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteSubcategory">
62+
<argument name="categoryEntity" value="CategoryB"/>
63+
</actionGroup>
64+
65+
<!-- Delete product -->
66+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct">
67+
<argument name="sku" value="{{ConfigurableProduct1.sku}}"/>
68+
</actionGroup>
69+
70+
<!-- Goto, Stores > Attributes > Product > Filter by attribute label 'Color' > Edit-->
71+
<actionGroup ref="AdminNavigateToProductAttributeEditPageActionGroup" stepKey="navigateToColorProductAttribute2">
72+
<argument name="ProductAttributeLabel" value="{{ConfigurableProduct1.color_label}}"/>
73+
</actionGroup>
74+
<!-- Remove color attribute options -->
75+
<actionGroup ref="AdminRemoveOptionsFromColorAttributeActionGroup" stepKey="removeOptionsFromColorAttribute"/>
76+
77+
<!-- Goto, Stores > Attributes > Product > Filter by attribute label 'Size' > Edit and Perform attribute deletion-->
78+
<actionGroup ref="AdminNavigateToProductAttributeEditPageActionGroup" stepKey="navigateToSizeProductAttribute">
79+
<argument name="ProductAttributeLabel" value="Size"/>
80+
</actionGroup>
81+
<!-- Delete attribute - Size -->
82+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeSize" />
83+
84+
<!-- Unassign product attribute from Default attribute set -->
85+
<actionGroup ref="AdminUnassignAttributeFromDefaultSetActionGroup" stepKey="unassignColorAttributeFromDefaultAttributeSet">
86+
<argument name="ProductAttributeCode" value="color"/>
87+
</actionGroup>
88+
89+
<!-- Admin Logout -->
90+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
91+
</after>
92+
93+
<!--Create a configurable product-->
94+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToProductCreatePage">
95+
<argument name="attributeSetId" value="{{AddToDefaultSet.attributeSetId}}"/>
96+
<argument name="productType" value="configurable"/>
97+
</actionGroup>
98+
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{ConfigurableProduct1.name}}" stepKey="fillProductName"/>
99+
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{ConfigurableProduct1.sku}}" stepKey="fillProductSku"/>
100+
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{ConfigurableProduct1.price}}" stepKey="fillProductPrice"/>
101+
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{CategoryB.name}}]" stepKey="selectCategory"/>
102+
<!-- Setup configurations-->
103+
<click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
104+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
105+
<!--Add attributes and select all options -->
106+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeRowByAttributeCode('color')}}" stepKey="clickOnColorAttributeCheckbox"/>
107+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeRowByAttributeCode('size')}}" stepKey="clickOnSizeAttributeCheckbox"/>
108+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
109+
<click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute('Color')}}" stepKey="clickOnSelectAllInColorAttribute"/>
110+
<click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute('Size')}}" stepKey="clickOnSelectAllInSizeAttribute"/>
111+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
112+
<!-- Add unique images to product attribute options -->
113+
<actionGroup ref="AddUniqueImageToConfigurableProductOptionActionGroup" stepKey="addImageToConfigurableProductOption1">
114+
<argument name="image" value="TestImageNew"/>
115+
<argument name="frontend_label" value="{{ConfigurableProduct1.color_label}}"/>
116+
<argument name="label" value="{{ConfigurableProduct1.color_option1}}"/>
117+
</actionGroup>
118+
<actionGroup ref="AddUniqueImageToConfigurableProductOptionActionGroup" stepKey="addImageToConfigurableProductOption2">
119+
<argument name="image" value="MagentoLogo"/>
120+
<argument name="frontend_label" value="{{ConfigurableProduct1.color_label}}"/>
121+
<argument name="label" value="{{ConfigurableProduct1.color_option2}}"/>
122+
</actionGroup>
123+
<!-- Add unique price to product attribute options -->
124+
<actionGroup ref="AddUniquePriceToConfigurableProductOptionActionGroup" stepKey="addPriceToConfigurableProductOption1">
125+
<argument name="frontend_label" value="Size"/>
126+
<argument name="label" value="{{ConfigurableProduct1.size_option1}}"/>
127+
<argument name="price" value="4"/>
128+
</actionGroup>
129+
<actionGroup ref="AddUniquePriceToConfigurableProductOptionActionGroup" stepKey="addPriceToConfigurableProductOption2">
130+
<argument name="frontend_label" value="Size"/>
131+
<argument name="label" value="{{ConfigurableProduct1.size_option2}}"/>
132+
<argument name="price" value="6"/>
133+
</actionGroup>
134+
<!-- Add quantity to product attribute options -->
135+
<click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
136+
<fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="10000" stepKey="enterAttributeQuantity"/>
137+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
138+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
139+
<!-- Save product -->
140+
<actionGroup ref="SaveConfigurableProductAddToCurrentAttributeSetActionGroup" stepKey="saveProduct"/>
141+
142+
<!-- Reindex invalidated indices for the product to be visible in Storefront -->
143+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndicesPostChangingConfigurationSettings">
144+
<argument name="indices" value=""/>
145+
</actionGroup>
146+
147+
<!-- Verify on storefront that category and product is visible -->
148+
<actionGroup ref="StorefrontNavigateToCategoryUrlActionGroup" stepKey="goToCategoryStorefrontPage">
149+
<argument name="categoryUrl" value="{{CategoryB.urlKey}}"/>
150+
</actionGroup>
151+
<waitForText userInput="{{CategoryB.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryNameOnStorefront"/>
152+
<waitForText userInput="{{ConfigurableProduct1.name}}" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="assertProductVisibleInStorefront"/>
153+
154+
<!-- Navigate to Product Page -->
155+
<click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openConfigurableProduct"/>
156+
<waitForPageLoad stepKey="waitForProductPageLoad"/>
157+
158+
<!-- Select configurable product option on Storefront and Verify that unique images are visible for different color options -->
159+
<actionGroup ref="StorefrontVerifyConfigurableProductImagesActionGroup" stepKey="storefrontVerifyUniqueImagesForConfigurableProductOption">
160+
<argument name="attributeOption1" value="{{ConfigurableProduct1.color_label}}"/>
161+
<argument name="attributeOption2" value="{{ConfigurableProduct1.size_label}}"/>
162+
</actionGroup>
163+
</test>
164+
</tests>

‎app/code/Magento/Cookie/Test/Mftf/Test/StorefrontVerifySecureCookieTest.xml

+6-6
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 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -25,8 +25,8 @@
2525
<before>
2626
<amOnPage url="/" stepKey="goToHomePage"/>
2727
<executeJS function="return window.location.host" stepKey="hostname"/>
28-
<magentoCLI command="config:set web/unsecure/base_url https://{$hostname}/" stepKey="setUnsecureBaseURL"/>
29-
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
28+
<magentoCLI command="config:set web/unsecure/base_url http://{$hostname}/" stepKey="setUnsecureBaseURL"/>
29+
<magentoCLI command="config:set web/secure/base_url http://{$hostname}/" stepKey="setSecureBaseURL"/>
3030
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
3131
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
3232
<argument name="tags" value="full_page"/>
@@ -44,12 +44,12 @@
4444
<executeJS function="return window.cookiesConfig.secure ? 'true' : 'false'" stepKey="isCookieSecure"/>
4545
<assertEquals stepKey="assertCookieIsSecure">
4646
<actualResult type="variable">isCookieSecure</actualResult>
47-
<expectedResult type="string">true</expectedResult>
47+
<expectedResult type="string">false</expectedResult>
4848
</assertEquals>
4949
<executeJS function="return jQuery.mage.cookies.defaults.secure ? 'true' : 'false'" stepKey="isCookieSecure2"/>
5050
<assertEquals stepKey="assertCookieIsSecure2">
5151
<actualResult type="variable">isCookieSecure2</actualResult>
52-
<expectedResult type="string">true</expectedResult>
52+
<expectedResult type="string">false</expectedResult>
5353
</assertEquals>
5454
</test>
5555
</tests>

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistoryTest.xml

+5-2
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 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -26,6 +26,9 @@
2626
</createData>
2727
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
2828
<createData entity="Simple_US_Customer" stepKey="createCustomer2"/>
29+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
30+
<argument name="indices" value=""/>
31+
</actionGroup>
2932
</before>
3033
<after>
3134
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />

‎app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml

+3-3
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 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -19,7 +19,7 @@
1919
<data key="store_id">Default Store View</data>
2020
<data key="number_of_results">1</data>
2121
<data key="number_of_uses">20</data>
22-
<data key="redirect_url">http://example.com</data>
22+
<data key="redirect_url">https://example.com</data>
2323
<data key="display_in_suggested_term">No</data>
2424
</entity>
2525
</entities>

‎app/code/Magento/Shipping/Test/Mftf/Test/StorefrontDisplayTableRatesShippingMethodForAETest.xml

+4-2
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 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -73,6 +73,8 @@
7373
<!--Proceed to Review and Payments section-->
7474
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickToSaveShippingInfo"/>
7575
<waitForPageLoad stepKey="waitForReviewAndPaymentsPageIsLoaded"/>
76+
<!-- Select Check Money Order Payment Method -->
77+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMO"/>
7678
<!--Place order and assert the message of success-->
7779
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrderProductSuccessful"/>
7880
</test>

‎composer.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/acceptance/tests/functional/Magento/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerCheckConfigurableProductInWishlistSidebarActionGroup.xml

+3-2
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 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -18,6 +18,7 @@
1818
<argument name="optionProductVar"/>
1919
</arguments>
2020
<wait time="10" stepKey="waitForMessageToPopulate"/>
21+
<reloadPage stepKey="reloadPage"/>
2122
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
2223
<waitForElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductTitleByName(productVar.name)}}" time="30" stepKey="assertWishlistSidebarProductName"/>
2324
<see userInput="${{optionProductVar.price}}.00" selector="{{StorefrontCustomerWishlistSidebarSection.ProductPriceByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductPrice"/>

0 commit comments

Comments
 (0)
Please sign in to comment.