Merge branch '2.4-develop' of https://github.com/magento-epam/magento2ce into MC-32789-Squashed

Author: jcuerdo

app/code/Magento/Catalog/Model/Product/SalabilityChecker.php

@@ -147,7 +147,7 @@ private function processCategoryLinks($newCategoryPositions, &$oldCategoryPositi
      * @param bool $insert
      * @return array
      */
-    private function updateCategoryLinks(ProductInterface $product, array $insertLinks, $insert = false)
+    public function updateCategoryLinks(ProductInterface $product, array $insertLinks, $insert = false)
     {
         if (empty($insertLinks)) {
             return [];

app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php

@@ -0,0 +1,21 @@
+<?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="AssertStorefrontCategoryCurrentPageIsNthActionGroup">
+        <arguments>
+            <argument name="expectedPage" type="string"/>
+        </arguments>
+
+        <grabTextFrom selector="{{StorefrontCategoryBottomToolbarSection.currentPage}}" stepKey="currentPageText"/>
+        <assertEquals stepKey="assertIsPageNth">
+            <expectedResult type="string">{{expectedPage}}</expectedResult>
+            <actualResult type="variable">currentPageText</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>

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

@@ -0,0 +1,17 @@
+<?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="StorefrontNavigateCategoryNextPageActionGroup">
+        <annotations>
+            <description>Navigates storefront category next page from toolbar</description>
+        </annotations>
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
+        <waitForPageLoad stepKey="waitForNextCategoryPageLoad"/>
+    </actionGroup>
+</actionGroups>

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

@@ -12,6 +12,6 @@
         <element name="previousPage" type="button" selector=".//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'previous')]" timeout="30"/>
         <element name="pageNumber" type="text" selector="//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'page')]//span[2][contains(text() ,'{{var1}}')]" parameterized="true"/>
         <element name="perPage" type="select" selector="//*[@class='toolbar toolbar-products'][2]//select[@id='limiter']"/>
-        <element name="currentPage" type="text" selector=".products.wrapper + .toolbar-products .pages .current span:nth-of-type(2)"/>
+        <element name="currentPage" type="text" selector=".//*[@class='toolbar toolbar-products'][2]//li[contains(@class, 'current')]//span[2]" timeout="30"/>
     </section>
 </sections>

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

@@ -89,7 +89,6 @@ public function saveLinks(
         $resource = $this->linkFactory->create();
         $mainTable = $resource->getMainTable();
         $positionAttrId = [];
-        $nextLinkId = $this->resourceHelper->getNextAutoincrement($mainTable);
 
         // pre-load 'position' attributes ID for each link type once
         foreach ($this->linkNameToId as $linkId) {
@@ -103,6 +102,7 @@ public function saveLinks(
             $positionAttrId[$linkId] = $importEntity->getConnection()->fetchOne($select, $bind);
         }
         while ($bunch = $dataSourceModel->getNextBunch()) {
+            $nextLinkId = $this->resourceHelper->getNextAutoincrement($mainTable);
             $this->processLinkBunches($importEntity, $linkField, $bunch, $resource, $nextLinkId, $positionAttrId);
         }
     }

app/code/Magento/CatalogImportExport/Model/Import/Product/LinkProcessor.php

@@ -13,6 +13,7 @@
             <stories value="Use Advanced Search"/>
             <title value="Unable negative price use to advanced search"/>
             <description value="Check unable negative price use to advanced search by price from and price to"/>
+            <severity value="MAJOR"/>
         </annotations>
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
         <actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="openAdvancedSearch"/>

app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontCheckUnableAdvancedSearchWithNegativePriceTest.xml

@@ -105,7 +105,7 @@
                                                                     <item name="trigger" xsi:type="string">opc-new-shipping-address</item>
                                                                     <item name="buttons" xsi:type="array">
                                                                         <item name="save" xsi:type="array">
-                                                                            <item name="text" xsi:type="string" translate="true">Ship here</item>
+                                                                            <item name="text" xsi:type="string" translate="true">Ship Here</item>
                                                                             <item name="class" xsi:type="string">action primary action-save-address</item>
                                                                         </item>
                                                                         <item name="cancel" xsi:type="array">

app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml

@@ -38,6 +38,8 @@
         <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
         <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']"/>
         <element name="ButtonToShow" type="multiselect" selector="select[name='parameters[show_buttons][]']"/>
+        <element name="InputAnchorCustomText" type="input" selector="input[name='parameters[anchor_text]']"/>
+        <element name="InputAnchorCustomTitle" type="input" selector="input[name='parameters[title]']"/>
         <!--Compare on Storefront-->
         <element name="ProductName" type="text" selector=".product.name.product-item-name"/>
         <element name="CompareBtn" type="button" selector=".action.tocompare"/>

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/WidgetSection.xml

@@ -14,6 +14,7 @@
             <stories value="Delete a CMS Page via the Admin"/>
             <title value="Admin should be able to delete CMS Pages"/>
             <description value="Admin should be able to delete CMS Pages"/>
+            <severity value="CRITICAL"/>
             <group value="Cms"/>
             <group value="WYSIWYGDisabled"/>
         </annotations>