Skip to content

Commit f39a2e0

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #29143: [MFTF] use ActionGroup for assertion in productGridCell (by @Usik2203) - #28838: Initialize toolbar.js once (by @ptylek) - #29001: Configurable Product Links Validation Bug when int value is 0 (by @engcom-Charlie) Fixed GitHub Issues: - #25934: chrome initiate two times toolbar.js (reported by @Bhavik-kumar) has been fixed in #28838 by @ptylek in 2.4-develop branch Related commits: 1. def4e04 2. 630bebd 3. f5f8556 4. 6cb1924 5. 7efd88d 6. aae14cc 7. 86a72f4 8. b25aafc - #13210: Configurable Product Links Validation Bug when int value is 0 (reported by @davidverholen) has been fixed in #29001 by @engcom-Charlie in 2.4-develop branch Related commits: 1. 2e4b71c 2. acd5177
2 parents a08fd19 + 21e1ad0 commit f39a2e0

File tree

23 files changed

+309
-50
lines changed

23 files changed

+309
-50
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToVirtualTest.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@
5454
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchForProduct">
5555
<argument name="product" value="_defaultProduct"/>
5656
</actionGroup>
57-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Virtual Product" stepKey="seeProductTypeInGrid"/>
57+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
58+
<argument name="row" value="1"/>
59+
<argument name="column" value="Type"/>
60+
<argument name="value" value="Virtual Product"/>
61+
</actionGroup>
5862
<actionGroup ref="AssertProductInStorefrontProductPageActionGroup" stepKey="AssertProductInStorefrontProductPage">
5963
<argument name="product" value="_defaultProduct"/>
6064
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToSimpleTest.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<actionGroup ref="FillMainProductFormActionGroup" stepKey="fillProductForm">
2626
<argument name="product" value="_defaultProduct"/>
2727
</actionGroup>
28-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product" stepKey="seeProductTypeInGrid"/>
28+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
29+
<argument name="row" value="1"/>
30+
<argument name="column" value="Type"/>
31+
<argument name="value" value="Simple Product"/>
32+
</actionGroup>
2933
</test>
3034
</tests>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminDownloadableProductTypeSwitchingToSimpleProductTest.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,16 @@
3333
<actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterSimpleProductGridBySku">
3434
<argument name="sku" value="$$createProduct.sku$$"/>
3535
</actionGroup>
36-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeSimpleProductNameInGrid"/>
37-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product" stepKey="seeSimpleProductTypeInGrid"/>
36+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeSimpleProductNameInGrid">
37+
<argument name="row" value="1"/>
38+
<argument name="column" value="Name"/>
39+
<argument name="value" value="$$createProduct.name$$"/>
40+
</actionGroup>
41+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeSimpleProductTypeInGrid">
42+
<argument name="row" value="1"/>
43+
<argument name="column" value="Type"/>
44+
<argument name="value" value="Simple Product"/>
45+
</actionGroup>
3846
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearSimpleProductFilters"/>
3947
<!--Assert simple product on storefront-->
4048
<comment userInput="Assert simple product on storefront" stepKey="commentAssertSimpleProductOnStorefront"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToDownloadableProductTest.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,16 @@
5353
<actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySku">
5454
<argument name="sku" value="$$createProduct.sku$$"/>
5555
</actionGroup>
56-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeDownloadableProductNameInGrid"/>
57-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Downloadable Product" stepKey="seeDownloadableProductTypeInGrid"/>
56+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeDownloadableProductNameInGrid">
57+
<argument name="row" value="1"/>
58+
<argument name="column" value="Name"/>
59+
<argument name="value" value="$$createProduct.name$$"/>
60+
</actionGroup>
61+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeDownloadableProductTypeInGrid">
62+
<argument name="row" value="1"/>
63+
<argument name="column" value="Type"/>
64+
<argument name="value" value="Downloadable Product"/>
65+
</actionGroup>
5866
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearDownloadableProductFilters"/>
5967
<!--Assert downloadable product on storefront-->
6068
<comment userInput="Assert downloadable product on storefront" stepKey="commentAssertDownloadableProductOnStorefront"/>

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@
7979
<argument name="keyword" value="SimpleProduct.name"/>
8080
</actionGroup>
8181
<seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOnlyOneProductInGrid"/>
82-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{SimpleProduct.name}}" stepKey="seeOnlySimpleProductInGrid"/>
82+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeOnlySimpleProductInGrid">
83+
<argument name="row" value="1"/>
84+
<argument name="column" value="Name"/>
85+
<argument name="value" value="{{SimpleProduct.name}}"/>
86+
</actionGroup>
8387

8488
<!--Paging works-->
8589
<actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="setProductGridToDefaultPagination"/>
@@ -105,7 +109,11 @@
105109
<argument name="product" value="GroupedProduct"/>
106110
</actionGroup>
107111
<seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOneMatchingSkuInProductGrid"/>
108-
<see selector="{{AdminProductGridSection.productGridCell('1','SKU')}}" userInput="{{GroupedProduct.sku}}" stepKey="seeProductInFilteredGridSku"/>
112+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductInFilteredGridSku">
113+
<argument name="row" value="1"/>
114+
<argument name="column" value="SKU"/>
115+
<argument name="value" value="{{GroupedProduct.sku}}"/>
116+
</actionGroup>
109117
<!--Filter by price-->
110118
<actionGroup ref="FilterProductGridByPriceRangeActionGroup" stepKey="filterProductGridByPrice">
111119
<argument name="filter" value="PriceFilterRange"/>
@@ -194,7 +202,11 @@
194202
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridToCheckWeightColumn">
195203
<argument name="product" value="SimpleProduct"/>
196204
</actionGroup>
197-
<see selector="{{AdminProductGridSection.productGridCell('1','Weight')}}" userInput="{{SimpleProduct.weight}}" stepKey="seeCorrectProductWeightInGrid"/>
205+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeCorrectProductWeightInGrid">
206+
<argument name="row" value="1"/>
207+
<argument name="column" value="Weight"/>
208+
<argument name="value" value="{{SimpleProduct.weight}}"/>
209+
</actionGroup>
198210
<!--END Admin uses product grid-->
199211

200212
<!--Admin creates category-->

‎app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,26 @@ define([
3535

3636
/** @inheritdoc */
3737
_create: function () {
38-
this._bind($(this.options.modeControl), this.options.mode, this.options.modeDefault);
39-
this._bind($(this.options.directionControl), this.options.direction, this.options.directionDefault);
40-
this._bind($(this.options.orderControl), this.options.order, this.options.orderDefault);
41-
this._bind($(this.options.limitControl), this.options.limit, this.options.limitDefault);
38+
this._bind(
39+
$(this.options.modeControl, this.element),
40+
this.options.mode,
41+
this.options.modeDefault
42+
);
43+
this._bind(
44+
$(this.options.directionControl, this.element),
45+
this.options.direction,
46+
this.options.directionDefault
47+
);
48+
this._bind(
49+
$(this.options.orderControl, this.element),
50+
this.options.order,
51+
this.options.orderDefault
52+
);
53+
this._bind(
54+
$(this.options.limitControl, this.element),
55+
this.options.limit,
56+
this.options.limitDefault
57+
);
4258
},
4359

4460
/** @inheritdoc */

‎app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
declare(strict_types=1);
8+
69
namespace Magento\ConfigurableProduct\Model\Plugin;
710

811
use Magento\Catalog\Api\Data\ProductInterface;
@@ -56,7 +59,7 @@ public function beforeSave(
5659
ProductRepositoryInterface $subject,
5760
ProductInterface $product,
5861
$saveOptions = false
59-
) {
62+
): array {
6063
$result[] = $product;
6164
if ($product->getTypeId() !== Configurable::TYPE_CODE) {
6265
return $result;
@@ -102,7 +105,7 @@ public function afterSave(
102105
ProductInterface $result,
103106
ProductInterface $product,
104107
$saveOptions = false
105-
) {
108+
): ProductInterface {
106109
if ($product->getTypeId() !== Configurable::TYPE_CODE) {
107110
return $result;
108111
}
@@ -120,19 +123,23 @@ public function afterSave(
120123
* @throws InputException
121124
* @throws NoSuchEntityException
122125
*/
123-
private function validateProductLinks(array $attributeCodes, array $linkIds)
126+
private function validateProductLinks(array $attributeCodes, array $linkIds): void
124127
{
125128
$valueMap = [];
126129
foreach ($linkIds as $productId) {
127130
$variation = $this->productRepository->getById($productId);
128131
$valueKey = '';
129132
foreach ($attributeCodes as $attributeCode) {
130-
if (!$variation->getData($attributeCode)) {
133+
if ($variation->getData($attributeCode) === null) {
131134
throw new InputException(
132-
__('Product with id "%1" does not contain required attribute "%2".', $productId, $attributeCode)
135+
__(
136+
'Product with id "%1" does not contain required attribute "%2".',
137+
$productId,
138+
$attributeCode
139+
)
133140
);
134141
}
135-
$valueKey = $valueKey . $attributeCode . ':' . $variation->getData($attributeCode) . ';';
142+
$valueKey .= $attributeCode . ':' . $variation->getData($attributeCode) . ';';
136143
}
137144
if (isset($valueMap[$valueKey])) {
138145
throw new InputException(

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@
8484
</actionGroup>
8585
<waitForPageLoad stepKey="wait2"/>
8686
<seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOneResult"/>
87-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="seeInGrid"/>
87+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeInGrid">
88+
<argument name="row" value="1"/>
89+
<argument name="column" value="Name"/>
90+
<argument name="value" value="{{ApiConfigurableProduct.name}}"/>
91+
</actionGroup>
8892
<see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="seeInActiveFilters"/>
8993
</test>
9094
</tests>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToSimpleTest.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<actionGroup ref="FillMainProductFormActionGroup" stepKey="fillProductForm">
2525
<argument name="product" value="_defaultProduct"/>
2626
</actionGroup>
27-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product" stepKey="seeProductTypeInGrid"/>
27+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
28+
<argument name="row" value="1"/>
29+
<argument name="column" value="Type"/>
30+
<argument name="value" value="Simple Product"/>
31+
</actionGroup>
2832
</test>
2933
</tests>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToVirtualTest.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="openProductFillForm">
2222
<argument name="productType" value="configurable"/>
2323
</actionGroup>
24-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Virtual Product" stepKey="seeProductTypeInGrid"/>
24+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
25+
<argument name="row" value="1"/>
26+
<argument name="column" value="Type"/>
27+
<argument name="value" value="Virtual Product"/>
28+
</actionGroup>
2529
</test>
2630
</tests>

0 commit comments

Comments
 (0)