Skip to content

Commit 7db931b

Browse files
Merge branch '2.4-develop' into Hammer-Platform-Health-Scope-02Dec24
2 parents c389f9a + 7d5e390 commit 7db931b

File tree

101 files changed

+2736
-325
lines changed

Some content is hidden

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

101 files changed

+2736
-325
lines changed

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

Lines changed: 2 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

@@ -18,8 +18,6 @@
1818
<testCaseId value="MC-115"/>
1919
<group value="Bundle"/>
2020
<group value="cloud"/>
21-
<!-- Excluded from PR builds due to AC-12124 -->
22-
<group value="pr_exclude"/>
2321
</annotations>
2422
<before>
2523
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
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
namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
@@ -269,6 +269,11 @@ public function execute()
269269

270270
unset($data['entity_type_id']);
271271

272+
if (array_key_exists('reset_is-default_option', $data) && $data['reset_is-default_option']) {
273+
unset($data['reset_is-default_option']);
274+
$data['default_value'] = null;
275+
}
276+
272277
$model->addData($data);
273278

274279
if (!$attributeId) {
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 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+
Lines changed: 31 additions & 0 deletions
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+
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 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

Lines changed: 8 additions & 3 deletions
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/Data/ProductData.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,4 +1580,28 @@
15801580
<requiredEntity type="product_option">ProductOptionDropDownFor2</requiredEntity>
15811581
<requiredEntity type="product_option">ProductOptionCheckboxFor2</requiredEntity>
15821582
</entity>
1583+
<entity name="ProductWithTwentyOneTextFieldOptions" type="product">
1584+
<var key="sku" entityType="product" entityKey="sku" />
1585+
<requiredEntity type="product_option">ProductOptionField</requiredEntity>
1586+
<requiredEntity type="product_option">ProductOptionField2</requiredEntity>
1587+
<requiredEntity type="product_option">ProductOptionField3</requiredEntity>
1588+
<requiredEntity type="product_option">ProductOptionField4</requiredEntity>
1589+
<requiredEntity type="product_option">ProductOptionField5</requiredEntity>
1590+
<requiredEntity type="product_option">ProductOptionField6</requiredEntity>
1591+
<requiredEntity type="product_option">ProductOptionField7</requiredEntity>
1592+
<requiredEntity type="product_option">ProductOptionField8</requiredEntity>
1593+
<requiredEntity type="product_option">ProductOptionField9</requiredEntity>
1594+
<requiredEntity type="product_option">ProductOptionField10</requiredEntity>
1595+
<requiredEntity type="product_option">ProductOptionField11</requiredEntity>
1596+
<requiredEntity type="product_option">ProductOptionField12</requiredEntity>
1597+
<requiredEntity type="product_option">ProductOptionField13</requiredEntity>
1598+
<requiredEntity type="product_option">ProductOptionField14</requiredEntity>
1599+
<requiredEntity type="product_option">ProductOptionField15</requiredEntity>
1600+
<requiredEntity type="product_option">ProductOptionField16</requiredEntity>
1601+
<requiredEntity type="product_option">ProductOptionField17</requiredEntity>
1602+
<requiredEntity type="product_option">ProductOptionField18</requiredEntity>
1603+
<requiredEntity type="product_option">ProductOptionField19</requiredEntity>
1604+
<requiredEntity type="product_option">ProductOptionField20</requiredEntity>
1605+
<requiredEntity type="product_option">ProductOptionField21</requiredEntity>
1606+
</entity>
15831607
</entities>

0 commit comments

Comments
 (0)