Skip to content

Commit c92be00

Browse files
engcom-Dashengcom-Dash
authored
Merge branch '2.4-develop' into ckd/minor-copyedit
2 parents 302763e + 9c05217 commit c92be00

File tree

33 files changed

+1425
-849
lines changed

33 files changed

+1425
-849
lines changed

‎app/code/Magento/Captcha/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"magento/module-store": "*",
1515
"magento/module-authorization": "*",
1616
"laminas/laminas-captcha": "^2.18",
17-
"magento/laminas-db": "^1.0.0"
17+
"magento/magento-zf-db": "^3.21"
1818
},
1919
"type": "magento2-module",
2020
"license": [

‎app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
namespace Magento\Catalog\Model\Product\Option\Type\File;
99

10-
use Laminas\Filter\File\Rename;
11-
use Laminas\File\Transfer\Exception\PhpEnvironmentException;
1210
use Magento\Catalog\Model\Product;
1311
use Magento\Catalog\Model\Product\Exception as ProductException;
1412
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -126,7 +124,6 @@ public function setProduct(Product $product)
126124
* @throws \Exception
127125
* @throws \Magento\Framework\Exception\InputException
128126
* @throws \Magento\Framework\Validator\Exception
129-
* @throws PhpEnvironmentException
130127
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
131128
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
132129
*/
@@ -184,8 +181,6 @@ public function validate($processingParams, $option)
184181
$filePath = $dispersion . '/' . $fileName;
185182
$fileFullPath = $this->mediaDirectory->getAbsolutePath($this->quotePath . $filePath);
186183

187-
$upload->addFilter(new Rename(['target' => $fileFullPath, 'overwrite' => true]));
188-
189184
if ($this->product !== null) {
190185
$this->product->getTypeInstance()->addFileQueue(
191186
[

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/StoreFrontDeleteProductImagesAssignedDifferentRolesTest.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 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

Lines changed: 4 additions & 4 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 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

Lines changed: 23 additions & 0 deletions
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

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 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

Lines changed: 27 additions & 0 deletions
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

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="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

Lines changed: 28 additions & 0 deletions
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

Lines changed: 15 additions & 0 deletions
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>

0 commit comments

Comments
 (0)