Skip to content

Commit ea24ad1

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/2.4-develop' into 2.4-develop-pr30
2 parents 46bd2dd + ed3f42b commit ea24ad1

File tree

435 files changed

+11299
-2311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

435 files changed

+11299
-2311
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
},
77
"require": {
88
"magento/framework": "*",
9+
"magento/framework-message-queue": "*",
910
"magento/framework-bulk": "*",
1011
"magento/module-authorization": "*",
1112
"magento/module-backend": "*",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
</annotations>
1515

1616
<waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible"/>
17+
<seeElement selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="assertAdminAccountTextElement"/>
1718
</actionGroup>
1819
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
<waitForPageLoad stepKey="waitForElementAdded"/>
8181

8282
<!-- Go to the shopping cart page and grab the value of the option title -->
83-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
84-
<waitForPageLoad stepKey="waitForCartPageLoad"/>
83+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart"/>
8584
<grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalBefore"/>
8685

8786
<!-- Find the product that we just created using the product grid -->
@@ -101,8 +100,7 @@
101100
<see stepKey="assertSuccess2" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
102101

103102
<!-- Go to the shopping cart page and make sure the title has changed -->
104-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart1"/>
105-
<waitForPageLoad stepKey="waitForCartPageLoad1"/>
103+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart1"/>
106104
<grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalAfter"/>
107105
<assertNotEquals stepKey="assertNotEquals">
108106
<actualResult type="string">{$grabTotalAfter}</actualResult>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@
100100
<see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{BundleProduct.name}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
101101

102102
<!-- Verify cart contents -->
103-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
104-
<waitForPageLoad stepKey="waitForCart"/>
103+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCart"/>
105104
<see selector="{{StorefrontBundledSection.nthItemOptionsTitle('1')}}" userInput="Option One" stepKey="seeOption1"/>
106105
<see selector="{{StorefrontBundledSection.nthItemOptionsTitle('2')}}" userInput="Option Two" stepKey="seeOption2"/>
107106
<see selector="{{StorefrontBundledSection.nthItemOptionsTitle('3')}}" userInput="Option Three" stepKey="seeOption3"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
<deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
3737
</after>
3838
<!--Make category-->
39-
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
40-
<waitForPageLoad stepKey="waitForCategoryPageLoad"/>
39+
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToCategoryPage"/>
4140
<actionGroup ref="CreateCategoryActionGroup" stepKey="createASubcategory">
4241
<argument name="categoryEntity" value="SimpleSubCategory"/>
4342
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@
8989
<waitForPageLoad stepKey="waitForElementAdded2"/>
9090

9191
<!-- Go to the shopping cart page and edit the first product -->
92-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
93-
<waitForPageLoad stepKey="waitForCartPageLoad"/>
92+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart"/>
9493
<waitForElementVisible stepKey="waitForInfoDropdown" selector="{{CheckoutCartSummarySection.total}}"/>
9594
<waitForPageLoad stepKey="waitForCartPageLoad3"/>
9695
<grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabTotalBefore"/>
@@ -107,8 +106,7 @@
107106
<waitForPageLoad stepKey="waitForElementAdded3"/>
108107

109108
<!-- Go to the shopping cart page -->
110-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart2"/>
111-
<waitForPageLoad stepKey="waitForCartPageLoad2"/>
109+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart2"/>
112110

113111
<!-- Assert that the options are both there and the proce no longer matches -->
114112
<see stepKey="assertBothOptions" selector="{{CheckoutCartProductSection.nthItemOption('2')}}" userInput="$$simpleProduct1.sku$$"/>

‎app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/BundlePriceTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public function testModifyMeta()
6868
];
6969
$priceParams = [
7070
'imports' => [
71-
'disabled' => 'ns = ${ $.ns }, index = ' . BundlePrice::CODE_PRICE_TYPE . ':checked'
71+
'disabled' => 'ns = ${ $.ns }, index = ' . BundlePrice::CODE_PRICE_TYPE . ':checked',
72+
'__disableTmpl' => ['disabled' => false],
7273
]
7374
];
7475
$priceMeta = [

‎app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/BundleWeightTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public function testModifyMeta()
5858
$weightParams = [
5959
'imports' => [
6060
'disabled' => 'ns = ${ $.ns }, index = ' . BundleWeight::CODE_WEIGHT_TYPE . ':checked',
61+
'__disableTmpl' => ['disabled' => false],
6162
]
6263
];
6364
$hasWeightParams = [

‎app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundleAdvancedPricing.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function __construct(ArrayManager $arrayManager)
3434
}
3535

3636
/**
37-
* {@inheritdoc}
37+
* @inheritdoc
3838
*/
3939
public function modifyMeta(array $meta)
4040
{
@@ -63,7 +63,7 @@ public function modifyMeta(array $meta)
6363
}
6464

6565
/**
66-
* {@inheritdoc}
66+
* @inheritdoc
6767
*/
6868
public function modifyData(array $data)
6969
{
@@ -88,7 +88,8 @@ private function modifyMsrpMeta(array $meta)
8888
$meta,
8989
[
9090
'imports' => [
91-
'disabled' => 'ns = ${ $.ns }, index = ' . static::CODE_PRICE_TYPE . ':checked'
91+
'disabled' => 'ns = ${ $.ns }, index = ' . static::CODE_PRICE_TYPE . ':checked',
92+
'__disableTmpl' => ['disabled' => false],
9293
]
9394
]
9495
);
@@ -103,7 +104,8 @@ private function modifyMsrpMeta(array $meta)
103104
$meta,
104105
[
105106
'imports' => [
106-
'disabled' => 'ns = ${ $.ns }, index = ' . static::CODE_PRICE_TYPE . ':checked'
107+
'disabled' => 'ns = ${ $.ns }, index = ' . static::CODE_PRICE_TYPE . ':checked',
108+
'__disableTmpl' => ['disabled' => false],
107109
]
108110
]
109111
);

‎app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundleCustomOptions.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
class BundleCustomOptions extends AbstractModifier
1616
{
1717
/**
18-
* {@inheritdoc}
18+
* @inheritdoc
1919
*/
2020
public function modifyMeta(array $meta)
2121
{
@@ -55,6 +55,7 @@ public function modifyCustomOptionsButton(array $meta, $group, $container, $butt
5555
if (!empty($meta[$group]['children'][$container]['children'][$button])) {
5656
$meta[$group]['children'][$container]['children'][$button]['arguments']['data']['config']['imports'] = [
5757
'visible' => '!ns = ${ $.ns }, index = ' . BundlePrice::CODE_PRICE_TYPE . ':checked',
58+
'__disableTmpl' => ['visible' => false],
5859
];
5960
}
6061
return $meta;
@@ -79,6 +80,7 @@ public function getErrorMessage($sortOrder)
7980
'sortOrder' => $sortOrder,
8081
'imports' => [
8182
'visible' => 'ns = ${ $.ns }, index = ' . BundlePrice::CODE_PRICE_TYPE . ':checked',
83+
'__disableTmpl' => ['visible' => false],
8284
],
8385
],
8486
],
@@ -87,7 +89,7 @@ public function getErrorMessage($sortOrder)
8789
}
8890

8991
/**
90-
* {@inheritdoc}
92+
* @inheritdoc
9193
*/
9294
public function modifyData(array $data)
9395
{

0 commit comments

Comments
 (0)