Skip to content

Commit 8d90d12

Browse files
committed
Merge remote-tracking branch 'mainline/2.4-develop' into 2.4.1-develop
2 parents c8e347f + fefca12 commit 8d90d12

File tree

80 files changed

+1008
-130
lines changed

Some content is hidden

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

80 files changed

+1008
-130
lines changed

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminFilterLegacyGridActionGroup">
1212
<arguments>
13-
<argument name="fieldSelector" type="string"/>
1413
<argument name="value" type="string"/>
1514
<argument name="button" type="string" defaultValue="{{AdminLegacyDataGridFilterSection.apply}}"/>
1615
</arguments>

app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<title value="Admin should be able to manage persistent shopping cart settings"/>
1616
<description value="Admin should be able to enable persistent shopping cart in Magento Admin backend and see additional options"/>
1717
<group value="backend"/>
18+
<severity value="MAJOR"/>
1819
</annotations>
1920

2021
<before>

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminOrderConfigureBundleProduct">
1212
<arguments>
13-
<argument name="productName" type="string" defaultValue="{{SimpleProduct.sku}}"/>
1413
<argument name="productNumber" type="string" defaultValue="1"/>
1514
<argument name="productQty" type="string" defaultValue="1"/>
1615
</arguments>

app/code/Magento/Bundle/Test/Mftf/ActionGroup/ViewBundleProductInAdminGridActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
</annotations>
1515
<arguments>
1616
<argument name="product" defaultValue="BundleProduct"/>
17-
<argument name="thumbnail" defaultValue="ProductPlaceholderImage"/>
1817
</arguments>
1918

2019
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>

app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="UpdateBundleProductViaImportTest">
1212
<annotations>
13+
<stories value="Update Bundle product via import"/>
1314
<features value="Import/Export"/>
1415
<title value="Update Bundle product via import"/>
1516
<description

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateAttributeWithValueWithTwoStoreViesFromProductPageActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</annotations>
1616
<arguments>
1717
<argument name="firstStoreViewName" type="string"/>
18-
<argument name="secondStoreViewName" type="string"/>
1918
</arguments>
2019

2120
<click selector="{{AdminProductFormNewAttributeSection.addValue}}" stepKey="addValue" after="selectAttributeType"/>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateSimpleProductWithTextOptionCharLimitActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<arguments>
1616
<argument name="category"/>
1717
<argument name="simpleProduct"/>
18-
<argument name="charLimit"/>
1918
</arguments>
2019

2120
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchScopeForProductAttributeActionGroup.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminSwitchScopeForProductAttributeActionGroup">
12-
<arguments>
13-
<argument name="scope" type="string" defaultValue="1"/>
14-
</arguments>
1512
<click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
1613
<waitForElementVisible selector="{{AttributePropertiesSection.Scope}}" stepKey="waitOpenAdvancedProperties"/>
1714
<selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectNecessaryScope"/>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCategoryImageInAdminActionGroup.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<annotations>
1313
<description>Requires navigation to the Category creation/edit page. Click on the Upload button. Validates that the Image exists.</description>
1414
</annotations>
15-
<arguments>
16-
<argument name="image" defaultValue="ProductImage"/>
17-
</arguments>
1815

1916
<conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
2017
<waitForPageLoad stepKey="waitForPageLoad"/>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
</annotations>
1515
<arguments>
1616
<argument name="itemType"/>
17-
<argument name="itemName"/>
1817
</arguments>
1918

2019
<conditionalClick selector="{{StorefrontCategorySidebarSection.filterOptionsTitle('itemType')}}" dependentSelector="{{StorefrontCategorySidebarSection.filterOptions}}" visible="false" stepKey="expandFilterOptions"/>

0 commit comments

Comments
 (0)