Skip to content

Commit e267eaa

Browse files
chittimachittima
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into T4-PR-04-08-2024
2 parents 73e87ae + c6bc830 commit e267eaa

File tree

66 files changed

+1442
-242
lines changed

Some content is hidden

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

66 files changed

+1442
-242
lines changed

‎app/code/Magento/Backend/Console/Command/MaintenanceStatusCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
5353
{
5454
$output->writeln(
5555
'<info>Status: maintenance mode is ' .
56-
($this->maintenanceMode->isOn() ? 'active' : 'not active') . '</info>'
56+
($this->maintenanceMode->isOn() ? 'enabled' : 'disabled') . '</info>'
5757
);
5858
$addressInfo = $this->maintenanceMode->getAddressInfo();
5959
$addresses = implode(' ', $addressInfo);

‎app/code/Magento/Backend/Model/Validator/IpValidator.php

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<?php
2+
23
/**
34
* Copyright © Magento, Inc. All rights reserved.
45
* See COPYING.txt for license details.
56
*/
7+
68
namespace Magento\Backend\Model\Validator;
79

10+
use Magento\Framework\App\Utility\IPAddress;
11+
812
/**
913
* Class to validate list of IPs for maintenance commands
1014
*/
@@ -25,12 +29,22 @@ class IpValidator
2529
*/
2630
private $invalidIps;
2731

32+
/**
33+
* @param IPAddress $ipAddress
34+
*/
35+
public function __construct(
36+
private readonly IPAddress $ipAddress,
37+
) {
38+
}
39+
2840
/**
2941
* Validates list of ips
3042
*
3143
* @param string[] $ips
3244
* @param bool $noneAllowed
45+
*
3346
* @return string[]
47+
*
3448
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
3549
*/
3650
public function validateIps(array $ips, $noneAllowed)
@@ -55,22 +69,26 @@ public function validateIps(array $ips, $noneAllowed)
5569
$messages[] = "Invalid IP $invalidIp";
5670
}
5771
}
72+
5873
return $messages;
5974
}
6075

6176
/**
6277
* Filter ips into 'none', valid and invalid ips
6378
*
6479
* @param string[] $ips
80+
*
6581
* @return void
6682
*/
6783
private function filterIps(array $ips)
6884
{
6985
foreach ($ips as $ip) {
70-
if (filter_var($ip, FILTER_VALIDATE_IP)) {
71-
$this->validIps[] = $ip;
72-
} elseif ($ip == 'none') {
86+
if ($ip === 'none') {
7387
$this->none[] = $ip;
88+
} elseif ($this->ipAddress->isValidAddress($ip)) {
89+
$this->validIps[] = $ip;
90+
} elseif ($this->ipAddress->isValidRange($ip)) {
91+
$this->validIps[] = $ip;
7492
} else {
7593
$this->invalidIps[] = $ip;
7694
}

‎app/code/Magento/Backend/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ public function executeDataProvider()
5353
return [
5454
[
5555
[true, ['127.0.0.1', '127.0.0.2']],
56-
'Status: maintenance mode is active' . PHP_EOL .
56+
'Status: maintenance mode is enabled' . PHP_EOL .
5757
'List of exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
5858
],
5959
[
6060
[true, []],
61-
'Status: maintenance mode is active' . PHP_EOL . 'List of exempt IP-addresses: none' . PHP_EOL
61+
'Status: maintenance mode is enabled' . PHP_EOL . 'List of exempt IP-addresses: none' . PHP_EOL
6262
],
6363
[
6464
[false, []],
65-
'Status: maintenance mode is not active' . PHP_EOL . 'List of exempt IP-addresses: none' . PHP_EOL
65+
'Status: maintenance mode is disabled' . PHP_EOL . 'List of exempt IP-addresses: none' . PHP_EOL
6666
],
6767
[
6868
[false, ['127.0.0.1', '127.0.0.2']],
69-
'Status: maintenance mode is not active' . PHP_EOL .
69+
'Status: maintenance mode is disabled' . PHP_EOL .
7070
'List of exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
7171
],
7272
];

‎app/code/Magento/Backend/Test/Unit/Model/Validator/IpValidatorTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\Backend\Test\Unit\Model\Validator;
99

1010
use Magento\Backend\Model\Validator\IpValidator;
11+
use Magento\Framework\App\Utility\IPAddress;
1112
use PHPUnit\Framework\TestCase;
1213

1314
/**
@@ -25,7 +26,9 @@ class IpValidatorTest extends TestCase
2526
*/
2627
protected function setUp(): void
2728
{
28-
$this->ipValidator = new IpValidator();
29+
$this->ipValidator = new IpValidator(
30+
new IPAddress()
31+
);
2932
}
3033

3134
/**
@@ -45,6 +48,7 @@ public function validateIpsNoneAllowedDataProvider(): array
4548
{
4649
return [
4750
[['127.0.0.1', '127.0.0.2'], []],
51+
[['127.0.0.0/24'], []],
4852
[['none'], []],
4953
[['none', '127.0.0.1'], ["Multiple values are not allowed when 'none' is used"]],
5054
[['127.0.0.1', 'none'], ["Multiple values are not allowed when 'none' is used"]],
@@ -72,6 +76,7 @@ public function validateIpsNoneNotAllowedDataProvider()
7276
{
7377
return [
7478
[['127.0.0.1', '127.0.0.2'], []],
79+
[['127.0.0.0/24'], []],
7580
[['none'], ["'none' is not allowed"]],
7681
[['none', '127.0.0.1'], ["'none' is not allowed"]],
7782
[['127.0.0.1', 'none'], ["'none' is not allowed"]],

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddOptionForBundleItemsActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
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="AdminClickAddOptionForBundleItemsActionGroup">
12+
<annotations>
13+
<description>Click 'Add Option' button for bundle items.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
17+
</actionGroup>
18+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
110110
<argument name="product" value="BundleProduct"/>
111111
</actionGroup>
112+
112113
<actionGroup ref="OpenProductForEditByClickingRowXColumnYInProductGridActionGroup" stepKey="clickOnBundleProductToEdit"/>
113114
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="conditionallyOpenSectionBundleItemsToEdit"/>
114115
<actionGroup ref="AdminClickAddOptionOnBundleProductEditPageActionGroup" stepKey="clickAddOption"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
4848
<!-- scrollTo before click to fix flaky failure -->
4949
<scrollTo selector="{{AdminProductFormBundleSection.addOption}}" stepKey="scrollToAddOption"/>
50-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
50+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption3"/>
5151
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
5252
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
5353
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
4343
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
44-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
44+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption3"/>
4545
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
4646
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
4747
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
4242
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
43-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
43+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption3"/>
4444
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
4545
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
4646
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4848

4949
<!--Create bundle product-->
50+
5051
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="conditionallyOpenSectionBundleItems"/>
5152
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickAddOption3"/>
5253
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleOptions"/>
@@ -88,6 +89,7 @@
8889
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad2"/>
8990

9091
<!--Create bundle product 2-->
92+
9193
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="conditionallyOpenSectionBundleItems2"/>
9294
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickAddOption32"/>
9395
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleOptions2"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
5353
<!-- scrollTo before click to fix flaky failure -->
5454
<scrollTo selector="{{AdminProductFormBundleSection.addOption}}" stepKey="scrollToAddOption"/>
55-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
55+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption3"/>
5656
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
5757
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
5858
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
<!-- Add two bundle items -->
5252
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
53-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
53+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption3"/>
5454
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
5555
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
5656
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4646

4747
<!-- Add two bundle items -->
48+
4849
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="conditionallyOpenSectionBundleItems"/>
4950
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickAddOption3"/>
5051
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleOptions"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillBundleName" after="goToCreateBundleProduct"/>
1919
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillBundleSku" after="fillBundleName"/>
20-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3" after="fillBundleSku"/>
20+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption3" after="fillBundleSku"/>
2121
<waitForElementVisible selector="{{AdminProductFormBundleSection.firstOptionTitle}}" stepKey="waitForBundleOptions" after="clickAddOption3"/>
2222
<fillField selector="{{AdminProductFormBundleSection.firstOptionTitle}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle" after="waitForBundleOptions"/>
2323
<selectOption selector="{{AdminProductFormBundleSection.firstInputType}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType" after="fillOptionTitle"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
<!--Create bundle product-->
4949
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
50-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
50+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption3"/>
5151
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
5252
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
5353
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
@@ -89,7 +89,7 @@
8989

9090
<!--Create bundle product 2-->
9191
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems2"/>
92-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption32"/>
92+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption32"/>
9393
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions2"/>
9494
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle2"/>
9595
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType2"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<!-- and then configure bundled items for this product -->
5555

5656
<scrollTo selector="{{AdminProductFormBundleSection.addOption}}" stepKey="scrollToAddOptionButton"/>
57-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
57+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption"/>
5858
<waitForPageLoad stepKey="waitForOptions"/>
5959
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="MFTF Test Bundle 1" stepKey="fillOptionTitle"/>
6060
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="checkbox" stepKey="selectInputType"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<!-- Add two bundle items -->
4747
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
4848
<scrollTo stepKey="scrollToBundleItems" selector="{{AdminProductFormBundleSection.bundledItems}}"/>
49-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
49+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption3"/>
5050
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
5151
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
5252
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
<!-- Add options -->
5555
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
56-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
56+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption"/>
5757
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
5858
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
5959
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
<!--Create bundle product-->
6161
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
62-
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
62+
<actionGroup ref="AdminClickAddOptionForBundleItemsActionGroup" stepKey="clickAddOption3"/>
6363
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
6464
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
6565
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>

0 commit comments

Comments
 (0)