Merge remote-tracking branch 'origin/MC-40859' into 2.4-develop-pr53

Author: Serhii Balko

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertAdminProductFormAdvancedPricingAddTierPriceActionGroup" extends="AdminProductFormAdvancedPricingAddTierPriceActionGroup">
+        <annotations>
+            <description>Check tier price on Advanced Pricing dialog on the Admin Product creation/edit page.</description>
+        </annotations>
+        <remove keyForRemoval="selectWebsite"/>
+        <remove keyForRemoval="selectCustomerGroup"/>
+        <remove keyForRemoval="fillQuantity"/>
+        <remove keyForRemoval="selectPriceType"/>
+        <remove keyForRemoval="fillPriceAmount"/>
+        <remove keyForRemoval="waitCustomerGroupFilterAppears"/>
+        <remove keyForRemoval="selectCustomerGroupValue"/>
+        <executeJS function="return window.getComputedStyle(document.querySelector(&quot;{$priceAmountSelector}&quot;)).getPropertyValue('min-width')" after="waitPriceAmountFieldAppers" stepKey="priceMinWidth"/>
+        <assertEquals after="priceMinWidth" stepKey="assertWebsiteAmounts">
+            <actualResult type="string">$priceMinWidth</actualResult>
+            <expectedResult type="string">60px</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" after="assertWebsiteAmounts" stepKey="clickCustomerGroupPriceDeleteButton"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductWithPercentageDiscountTest.xml

@@ -32,7 +32,7 @@
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
-        
+
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="loginAsAdmin"/>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
             <argument name="product" value="$$createSimpleProduct$$"/>
@@ -41,6 +41,10 @@
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
 
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButtonForAssert"/>
+        <actionGroup ref="AssertAdminProductFormAdvancedPricingAddTierPriceActionGroup" stepKey="assertProductTierPriceInput"/>
+        <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="doneButtonAfterAssert"/>
+
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToTopOfPage"/>
         <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCustomerGroupPriceAddButton"/>

app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less

@@ -99,6 +99,13 @@
         .admin__field + .admin__field {
             margin-left: @indent__s;
             margin-top: 0;
+            .admin__field-control {
+                .admin__control-addon {
+                    .admin__control-text {
+                        min-width: 6rem;
+                    }
+                }
+            }
         }
     }
 }