🔃 [Magento Community Engineering] Community Contributions - 2.4-develop daily delivery

Accepted Community Pull Requests:
 - #30074: add action group for AdminAdobeStockInsertRenditionImageFromGalleryFileSizeTest (by @engcom-Golf)
 - #30042: #1827: Improve AdminMediaGalleryUploadCategoryImageTest (by @joweecaquicla)
 - #29834: [MFTF] removed redundant action group (by @Usik2203)
 - #29962: [MFTF] Add AdminClickInvoiceButtonIntoOrderActionGroup (by @Usik2203)
 - #29931: [MFTF] add new AdminOpenCatalogProductPageActionGroup (by @Usik2203)
 - #29835: [MFTF] use action group to go to customer account (by @Usik2203)
 - #27698: [MFTF] Cancel created orders after checks on frontend (by @elevinskii)
 - #26470: #7720 (by @engcom-Charlie)


Fixed GitHub Issues:
 - #29838: [Issue] [MFTF] removed redundant action group (reported by @m2-assistant[bot]) has been fixed in #29834 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. 04aefed
     2. c024003
     3. b3bab92
     4. f164033
     5. 0305290
     6. 6df880a
     7. 255d035

 - #29982: [Issue] [WIP][MFTF] Add AdminClickInvoiceButtonIntoOrderActionGroup (reported by @m2-assistant[bot]) has been fixed in #29962 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. 3dd3bb9
     2. e406c82
     3. 18ffc03
     4. 5ced4ba
     5. ca45436
     6. 4fb0102
     7. 1df23c8

 - #29941: [Issue] [MFTF] add new AdminOpenCatalogProductPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #29931 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. b8ce61b
     2. 832bb01
     3. 547f090
     4. bd5b228
     5. 971df44

 - #29842: [Issue] [MFTF] use action group to go to customer account (reported by @m2-assistant[bot]) has been fixed in #29835 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. 18d82a3
     2. 93995c8
     3. 8690e43
     4. 2d100fd
     5. b5d1810

 - #28324: [Issue] [MFTF] Cancel created orders after checks on frontend (reported by @m2-backlog[bot]) has been fixed in #27698 by @elevinskii in 2.4-develop branch
   Related commits:
     1. 2b86774
     2. 83a4f09
     3. c66d517
     4. 24f9954
     5. fd3e813
     6. 939ced0
     7. 59c16ea
     8. 756f2dc
     9. d63b5d8
     10. 8895db4
     11. f2334ed
     12. 14ed4b7
     13. af6569f
     14. da7af27

 - #7720: Product Repository saves attribute values for existing product always on "Default Store Level" (reported by @itaymesh) has been fixed in #26470 by @engcom-Charlie in 2.4-develop branch
   Related commits:
     1. 042df41
     2. a039ff4
     3. 13af48a
     4. a5d7355
     5. 8c8949d
     6. 2c15517
     7. 156b3c2
     8. 347001f
     9. 28b5d9d
     10. a892a19
     11. 9b9d123

Author: magento-engcom-team

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

@@ -34,7 +34,6 @@
             <!-- Reset admin order filter -->
             <comment userInput="Reset admin order filter" stepKey="resetAdminOrderFilter"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingOrderGrid"/>
             <magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
@@ -84,8 +83,7 @@
         <comment userInput="Create invoice" stepKey="createInvoice"/>
 
         <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
-        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-        <waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
+        <actionGroup ref="AdminClickInvoiceButtonOrderViewActionGroup" stepKey="clickInvoiceButton"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
         <see selector="{{AdminInvoiceTotalSection.total('Subtotal')}}" userInput="$150.00" stepKey="seeCorrectGrandTotal"/>
         <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>

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

@@ -86,8 +86,7 @@
 
         <!--Add another bundle option with 2 items-->
         <!--Go to bundle product creation page-->
-        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
-        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage"/>
         <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
         <waitForPageLoad stepKey="WaitForClear"/>
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">

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

@@ -54,8 +54,7 @@
 
         <!--Testing that price appears correctly in admin catalog-->
         <!--Set filter to product name-->
-        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
-        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage"/>
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
@@ -75,8 +74,7 @@
 
         <!--Testing that price appears correctly in admin catalog-->
         <!--Set filter to product name-->
-        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage2"/>
-        <waitForPageLoad stepKey="WaitForPageToLoad2"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage2"/>
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName2">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>

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

@@ -96,8 +96,7 @@
         </actionGroup>
 
         <!--Filter catalog-->
-        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogProductPage"/>
-        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage"/>
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>

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

@@ -58,9 +58,7 @@
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
-        <!--Go to catalog deletion page-->
-        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogPage"/>
-        <waitForPageLoad stepKey="Loading"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogPage"/>
 
         <!--Apply Name Filter-->
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">

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

@@ -76,8 +76,7 @@
 
         <!--Testing that price appears correctly in admin catalog-->
         <!--Set filter to product name-->
-        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
-        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage"/>
         <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
         <waitForPageLoad stepKey="WaitForClear"/>
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">

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

@@ -24,8 +24,7 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
-        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
-        <waitForPageLoad stepKey="WaitForPageToLoad"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage"/>
         <!--Selecting new bundle product-->
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
             <argument name="product" value="BundleProduct"/>

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -30,7 +30,8 @@
 use Magento\Framework\Exception\ValidatorException;
 
 /**
- * Product Repository.
+ * @inheritdoc
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
@@ -543,7 +544,9 @@ public function save(ProductInterface $product, $saveOptions = false)
         if (!$ignoreLinksFlag && $ignoreLinksFlag !== null) {
             $productLinks = $product->getProductLinks();
         }
-        $productDataArray['store_id'] = (int)$this->storeManager->getStore()->getId();
+        if (!isset($productDataArray['store_id'])) {
+            $productDataArray['store_id'] = (int) $this->storeManager->getStore()->getId();
+        }
         $product = $this->initializeProductData($productDataArray, empty($existingProduct));
 
         $this->processLinks($product, $productLinks);
@@ -735,6 +738,7 @@ private function getCollectionProcessor()
     {
         if (!$this->collectionProcessor) {
             $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                // phpstan:ignore "Class Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor not found."
                 \Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor::class
             );
         }

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

@@ -0,0 +1,19 @@
+<?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="AdminOpenCatalogProductPageActionGroup">
+        <annotations>
+            <description>Open page with product grid.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="openCatalogProductPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+    </actionGroup>
+</actionGroups>

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

@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="GoToProductCatalogPageActionGroup">
+    <actionGroup name="GoToProductCatalogPageActionGroup" deprecated="Use AdminOpenCatalogProductPageActionGroup instead.">
         <annotations>
             <description>Goes to the Admin Products grid page.</description>
         </annotations>