Skip to content

Commit bdc4581

Browse files
nishant04412nishant04412
authored
Merge branch '2.4-develop' into arrows-platform-health-delivery
2 parents 8d68f74 + 9c48c55 commit bdc4581

File tree

311 files changed

+4157
-1096
lines changed

Some content is hidden

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

311 files changed

+4157
-1096
lines changed

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Backend\Console\Command;
77

@@ -22,9 +22,10 @@ class MaintenanceAllowIpsCommand extends AbstractSetupCommand
2222
/**
2323
* Names of input arguments or options
2424
*/
25-
const INPUT_KEY_IP = 'ip';
26-
const INPUT_KEY_NONE = 'none';
27-
const INPUT_KEY_ADD = 'add';
25+
public const INPUT_KEY_IP = 'ip';
26+
public const INPUT_KEY_NONE = 'none';
27+
public const INPUT_KEY_ADD = 'add';
28+
public const NAME = 'maintenance:allow-ips';
2829

2930
/**
3031
* @var MaintenanceMode
@@ -76,7 +77,7 @@ protected function configure(): void
7677
'Add the IP address to existing list'
7778
),
7879
];
79-
$this->setName('maintenance:allow-ips')
80+
$this->setName(self::NAME)
8081
->setDescription('Sets maintenance mode exempt IPs')
8182
->setDefinition(array_merge($arguments, $options));
8283

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Backend\Console\Command;
77

@@ -10,14 +10,16 @@
1010
*/
1111
class MaintenanceDisableCommand extends AbstractMaintenanceCommand
1212
{
13+
public const NAME = 'maintenance:disable';
14+
1315
/**
1416
* Initialization of the command
1517
*
1618
* @return void
1719
*/
1820
protected function configure()
1921
{
20-
$this->setName('maintenance:disable')->setDescription('Disables maintenance mode');
22+
$this->setName(self::NAME)->setDescription('Disables maintenance mode');
2123

2224
parent::configure();
2325
}

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Backend\Console\Command;
77

@@ -10,14 +10,16 @@
1010
*/
1111
class MaintenanceEnableCommand extends AbstractMaintenanceCommand
1212
{
13+
public const NAME = 'maintenance:enable';
14+
1315
/**
1416
* Initialization of the command
1517
*
1618
* @return void
1719
*/
1820
protected function configure(): void
1921
{
20-
$this->setName('maintenance:enable')->setDescription('Enables maintenance mode');
22+
$this->setName(self::NAME)->setDescription('Enables maintenance mode');
2123

2224
parent::configure();
2325
}

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Backend\Console\Command;
77

@@ -16,6 +16,8 @@
1616
*/
1717
class MaintenanceStatusCommand extends AbstractSetupCommand
1818
{
19+
public const NAME = 'maintenance:status';
20+
1921
/**
2022
* @var MaintenanceMode $maintenanceMode
2123
*/
@@ -40,7 +42,7 @@ public function __construct(MaintenanceMode $maintenanceMode)
4042
*/
4143
protected function configure(): void
4244
{
43-
$this->setName('maintenance:status')
45+
$this->setName(self::NAME)
4446
->setDescription('Displays maintenance mode status');
4547

4648
parent::configure();

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddCustomOptionsActionGroup.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 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminAddCustomOptionsActionGroup">
11+
<annotations>
12+
<description>Clicks on 'Add Option'. Adds the provided Options under the provided Custom Option Name to a Product on the Admin Product creation/edit page under the 'Customizable Options' section.</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="title" type="string"/>
16+
<argument name="price" type="string"/>
17+
</arguments>
18+
<!-- Add option based on the parameter -->
19+
<click stepKey="clickAddValue" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
20+
<fillField stepKey="fillInCustomOptionValueTitle" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{title}}"/>
21+
<fillField stepKey="fillInCustomOptionValuePrice" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{price}}"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddOptionsToSizeAttributeActionGroup.xml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 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="AdminAddOptionsToSizeAttributeActionGroup">
12+
<annotations>
13+
<description>Adds size option to a new Attribute on the Configurable Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="position" type="string" defaultValue="0"/>
17+
<argument name="size" type="string" defaultValue="S"/>
18+
</arguments>
19+
<!--Add option 1 to attribute-->
20+
<waitForElementVisible selector="{{AdminNewAttributePanel.optionAdminValue('position')}}" stepKey="waitForAdminTextBoxVisible"/>
21+
<fillField selector="{{AdminNewAttributePanel.optionAdminValue('position')}}" userInput="{{size}}" stepKey="fillAdminLabel"/>
22+
<waitForElementVisible selector="{{AdminNewAttributePanel.optionDefaultStoreValue('position')}}" stepKey="waitForDefaultStoreViewTextBoxVisible"/>
23+
<fillField selector="{{AdminNewAttributePanel.optionDefaultStoreValue('position')}}" userInput="{{size}}" stepKey="fillDefaultLabel"/>
24+
</actionGroup>
25+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateCategoryDescriptionActionGroup.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 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminUpdateCategoryDescriptionActionGroup">
10+
<annotations>
11+
<description>Update Category Description</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="description" type="string"/>
15+
</arguments>
16+
<scrollTo selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
17+
<click selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="selectContent"/>
18+
<scrollTo selector="{{AdminCategoryContentSection.description}}" x="0" y="-80" stepKey="scrollToDescription"/>
19+
<conditionalClick selector="{{AdminCategoryContentSection.categoryDescriptionUseDefault}}" dependentSelector="{{AdminCategoryContentSection.categoryDescriptionUseDefault}}" visible="true" stepKey="uncheckUseDefaultValueStoreView"/>
20+
<fillField selector="{{AdminCategoryContentSection.description}}" userInput="{{description}}" stepKey="fillUpdatedDescription"/>
21+
</actionGroup>
22+
</actionGroups>
23+

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateCategoryDisplaySettingsActionGroup.xml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminUpdateCategoryDisplaySettingsActionGroup">
10+
<annotations>
11+
<description>Update Category Display settings</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="availableSortOptions" type="string" defaultValue="Position"/>
15+
<argument name="defaultSortingOption" type="string" defaultValue="position"/>
16+
<argument name="priceRange" type="string" defaultValue="0"/>
17+
</arguments>
18+
<!--Select Display Setting and fill the options-->
19+
<scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
20+
<click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
21+
<checkOption selector="{{CategoryDisplaySettingsSection.productListCheckBox}}" stepKey="enableTheAvailableProductList"/>
22+
<selectOption selector="{{CategoryDisplaySettingsSection.productList}}" parameterArray="[{{availableSortOptions}}]" stepKey="selectPrice"/>
23+
<scrollTo selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" x="0" y="-80" stepKey="scrollToDefaultProductList"/>
24+
<checkOption selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" stepKey="enableTheDefaultProductList"/>
25+
<selectOption selector="{{CategoryDisplaySettingsSection.defaultProductList}}" userInput="{{defaultSortingOption}}" stepKey="selectPosition"/>
26+
<scrollTo selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}" x="0" y="-80" stepKey="scrollToLayeredNavPrice"/>
27+
<click selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}" stepKey="enableLayeredNavigationPrice"/>
28+
<fillField selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}" userInput="{{priceRange}}" stepKey="fillThePrice"/>
29+
</actionGroup>
30+
</actionGroups>
31+

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateCategoryMetaInformationActionGroup.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 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminUpdateCategoryMetaInformationActionGroup">
10+
<annotations>
11+
<description>Update meta information</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="metaTitle" type="string"/>
15+
</arguments>
16+
<scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization"/>
17+
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
18+
<conditionalClick selector="{{AdminCategorySEOSection.MetaTitleDefaultValueCheckbox}}" dependentSelector="{{AdminCategorySEOSection.MetaTitleDefaultValueCheckbox}}" visible="true" stepKey="uncheckUseDefaultValueStoreView"/>
19+
<waitForElementVisible selector="{{AdminCategorySEOSection.MetaTitleInput}}" stepKey="waitForElementVisible"/>
20+
<fillField selector="{{AdminCategorySEOSection.MetaTitleInput}}" userInput="{{metaTitle}}" stepKey="fillUpdatedMetaTitle"/>
21+
</actionGroup>
22+
</actionGroups>
23+

‎app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="_defaultCategory" type="category">
1212
<data key="name" unique="suffix">simpleCategory</data>
1313
<data key="name_lwr" unique="suffix">simplecategory</data>
@@ -316,4 +316,9 @@
316316
<var key="category_id" entityKey="id" entityType="category"/>
317317
<var key="sku" entityKey="sku" entityType="product"/>
318318
</entity>
319+
<entity name="ApiCategoryNonAnchor" type="category">
320+
<data key="name" unique="suffix">ApiCategoryNonAnchor</data>
321+
<data key="is_active">true</data>
322+
<requiredEntity type="custom_attribute">CustomAttributeCategoryNonAnchor</requiredEntity>
323+
</entity>
319324
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml

+1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
<element name="productSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
2727
<element name="productTableColumnSku" type="input" selector="#catalog_category_products_filter_sku"/>
2828
<element name="categoryImageUseDefault" type="checkbox" selector="input[name='use_default[image]']"/>
29+
<element name="categoryDescriptionUseDefault" type="checkbox" selector="input[name='use_default[description]']"/>
2930
</section>
3031
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminCategorySEOSection">
1212
<element name="SectionHeader" type="button" selector="div[data-index='search_engine_optimization'] .fieldset-wrapper-title" timeout="30"/>
1313
<element name="sectionBody" type="text" selector="div[data-index='search_engine_optimization'] .admin__fieldset-wrapper-content"/>
@@ -17,5 +17,6 @@
1717
<element name="MetaTitleInput" type="input" selector="input[name='meta_title']"/>
1818
<element name="MetaKeywordsInput" type="textarea" selector="textarea[name='meta_keywords']"/>
1919
<element name="MetaDescriptionInput" type="textarea" selector="textarea[name='meta_description']"/>
20+
<element name="MetaTitleDefaultValueCheckbox" type="button" selector="input[name='use_default[meta_title]']"/>
2021
</section>
2122
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml

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

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryHeadSection.xml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="StorefrontCategoryHeadSection">
11+
<element name="pageTitle" type="text" selector="//head//meta[@name='title' and @content='{{title}}']" parameterized="true"/>
12+
</section>
13+
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml

+1
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@
5151
<element name="sortByDropdownContent" type="select" selector="//select[@id='sorter']//option[contains(text(),'{{arg}}')]" parameterized="true"/>
5252
<element name="productInOrderDisplay" type="text" selector="//li[@class='item product product-item'][{{index}}]//a[@class='product-item-link' and contains(text(),'{{product_name}}')]" parameterized="true"/>
5353
<element name="enableCookies" type="text" selector="//a//span[contains(text(),'Enable Cookies')]"/>
54+
<element name="CatalogDescriptionWithoutPTag" type="text" selector="//div[@class='category-description']"/>
5455
</section>
5556
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml

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

0 commit comments

Comments
 (0)