Merge branch '2.4-develop' into ACPT-6

Author: vzabaznov

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

@@ -40,5 +40,6 @@
         <element name="productOptionList" type="text" selector="#narrow-by-list"/>
         <element name="productNameByPosition" type="text" selector=".products-grid li:nth-of-type({{position}}) .product-item-name a" parameterized="true"/>
         <element name="sidebarAdditional" type="block" selector="#maincontent .sidebar.sidebar-additional"/>
+        <element name="searchStore" type="input" selector="//div/input[@id='search']" />
     </section>
 </sections>

app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml

@@ -97,6 +97,8 @@
         </assertStringContainsString>
         <!--Remove the category from the product and assert that it removed-->
         <comment userInput="Remove the category from the product and assert that it removed" stepKey="assertCategoryRemoved"/>
+        <scrollTo selector='//label/span[contains(text(),"Quantity")]' stepKey="scrollToCategorySection"/>
+
         <actionGroup ref="RemoveCategoryFromProductActionGroup" stepKey="removeCategoryFromProduct">
             <argument name="categoryName" value="$$createCategory.name$$"/>
         </actionGroup>

app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml

@@ -17,9 +17,6 @@
             <severity value="BLOCKER"/>
             <testCaseId value="MC-25687"/>
             <group value="product"/>
-            <skip>
-                <issueId value="MQE-3515">Skipped</issueId>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/CatalogWidget/Test/Mftf/Test/StorefrontProductGridUIUpdatesOnDesktopTest.xml

@@ -61,6 +61,7 @@
         <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="navigateAndOpenCreatedCmsPage">
             <argument name="identifier" value="$createCmsPage.identifier$"/>
         </actionGroup>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.searchStore}}" stepKey="hoverSearchTextField"/>
         <actionGroup ref="AssertStorefrontProductControlsAreNotVisibleWithoutHoverActionGroup" stepKey="assertProductControlsAreNotVisibleWithoutHoverOnCmsPage"/>
         <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref($createFirstSimpleProduct.custom_attributes[url_key]$)}}" stepKey="assertProductName"/>
         <seeElement selector="{{StorefrontCategoryMainSection.productPriceByName($createFirstSimpleProduct.name$)}}" stepKey="assertProductPrice"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml

@@ -12,7 +12,7 @@
         <data key="productName" unique="prefix">Shoes</data>
         <data key="price">60</data>
         <data key="weight">100</data>
-        <data key="defaultLabel">design</data>
+        <data key="defaultLabel">design123</data>
         <data key="adminFieldRed">red</data>
         <data key="defaultStoreViewFieldRed">red123</data>
         <data key="adminFieldBlue">blue</data>

app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection/CatalogProductsSection.xml

@@ -14,7 +14,7 @@
         <element name="searchDefaultLabelField" type="input" selector="//*[@id='attributeGrid_filter_frontend_label']"/>
         <element name="searchButton" type="button" selector="//div[@class='admin__filter-actions']//*[contains(text(), 'Search')]"/>
         <element name="storesProductItem" type="button" selector="//*[@data-ui-id='menu-magento-catalog-catalog-attributes-attributes']/a"/>
-        <element name="createdAttributeItem" type="button" selector="//td[contains(@class, 'col-label') and normalize-space()='design']"/>
+        <element name="createdAttributeItem" type="button" selector="//td[contains(@class, 'col-label') and normalize-space()='design123']"/>
         <element name="deleteAttributeItem" type="button" selector="//*[@id='delete']"/>
         <element name="okButton" type="button" selector="//footer[@class='modal-footer']//*[contains(text(),'OK')]"/>
         <element name="messageSuccessSavedProduct" type="button" selector="//div[@data-ui-id='messages-message-success']"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection/ConfigurableProductSection.xml

@@ -12,7 +12,7 @@
         <element name="configProductItem" type="button" selector="//*[@id='add_new_product']//*[contains(text(),'Configurable Product')]"/>
         <element name="nextButton" type="button" selector="//div[@class='nav-bar-outer-actions']//*[contains(text(),'Next')]"/>
         <element name="generateConfigure" type="button" selector="//div[@class='nav-bar-outer-actions']//*[contains(text(),'Generate Products')]"/>
-        <element name="selectCreatedAttribute" type="button" selector="//*[@class='admin__data-grid-wrap']//td[normalize-space()='design']/preceding-sibling::td"/>
+        <element name="selectCreatedAttribute" type="button" selector="//*[@class='admin__data-grid-wrap']//td[normalize-space()='design123']/preceding-sibling::td"/>
         <element name="closeFrame" type="button" selector="//*[@class='modal-header']//*[contains(text(),'Create Product Configurations')]/following-sibling::button"/>
     </section>
 </sections>

app/code/Magento/Swatches/Test/Mftf/ActionGroup/AssertStorefrontSwatchColorActionGroup.xml

@@ -17,7 +17,8 @@
             <argument name="expectedRgb" type="string" defaultValue="rgb(231, 77, 60)"/>
         </arguments>
 
-        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption(nthSwatch)}}" userInput="style" stepKey="grabStyle1"/>
+        <executeJS function="return document.evaluate(&quot;//div[@class='swatch-option color'][{{nthSwatch}}]&quot;,
+document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.style.cssText" stepKey="grabStyle1" />
         <assertEquals stepKey="assertStyle1">
             <actualResult type="string">{$grabStyle1}</actualResult>
             <expectedResult type="string">background: center center no-repeat {{expectedRgb}};</expectedResult>

app/code/Magento/Swatches/Test/Mftf/ActionGroup/AssertSwatchColorActionGroup.xml

@@ -16,7 +16,8 @@
             <argument name="expectedStyle" type="string" defaultValue="background: rgb(0, 0, 0);"/>
         </arguments>
 
-        <grabAttributeFrom selector="{{AdminManageSwatchSection.nthSwatch(nthSwatch)}}" userInput="style" stepKey="grabStyle1"/>
+        <executeJS function="return document.evaluate(&quot;//tbody[@data-role='swatch-visual-options-container']//tr[{{nthSwatch}}]//td[@class='swatches-visual-col col-default ']//div[@class='swatch_window']&quot;,
+document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.style.cssText" stepKey="grabStyle1" />
         <assertEquals stepKey="assertStyle1">
             <actualResult type="string">{$grabStyle1}</actualResult>
             <expectedResult type="string">{{expectedStyle}}</expectedResult>

app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml

@@ -27,5 +27,6 @@
         <element name="nthUploadFile" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) .swatch_row_name.btn_choose_file_upload" parameterized="true"/>
         <element name="nthDelete" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) button.delete-option" parameterized="true"/>
         <element name="deleteBtn" type="button" selector="#manage-options-panel:nth-of-type({{var}}) button.delete-option" parameterized="true"/>
+        <element name="manageSwatchSection" type="block" selector='//legend/span[contains(text(),"Manage Swatch (Values of Your Attribute)")]'/>
     </section>
 </sections>