Merge remote-tracking branch 'magento/2.4-develop' into patch-2

Author: engcom-Charlie

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/AdobeStock_232925587.png

@@ -7,7 +7,7 @@ The Magento_AdvancedSearch module introduces advanced search functionality and p
 Before disabling or uninstalling this module, note that the following modules depends on this module:
 
 - Magento_Elasticsearch
-- Magento_Elasticsearch6
+- Magento_Elasticsearch7
 
 For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-subcommands-enable.html).
 

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/AdobeStock_232925587@2x.png

@@ -6,8 +6,11 @@
  */
 namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
 
+use Magento\AsynchronousOperations\Model\Operation;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation as OperationResourceModel;
+
 /**
- * Class Collection
+ * Class Collection for Magento Operation table
  * @codeCoverageIgnore
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
@@ -20,9 +23,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
     protected function _construct()
     {
         $this->_init(
-            \Magento\AsynchronousOperations\Model\Operation::class,
-            \Magento\AsynchronousOperations\Model\ResourceModel\Operation::class
+            Operation::class,
+            OperationResourceModel::class
         );
         $this->setMainTable('magento_operation');
+        $this->_setIdFieldName(OperationResourceModel::TABLE_PRIMARY_KEY);
     }
 }

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/adobe-commerce-dark.png

@@ -527,6 +527,10 @@ public function getRealPath($path)
      */
     public function rename($oldPath, $newPath, DriverInterface $targetDriver = null): bool
     {
+        if ($oldPath === $newPath) {
+            return true;
+        }
+
         try {
             $this->adapter->move(
                 $this->normalizeRelativePath($oldPath, true),

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/adobe-commerce-light.png

@@ -496,4 +496,21 @@ public function testCreateDirectory(): void
 
         self::assertTrue($this->driver->createDirectory(self::URL . 'test/test2/'));
     }
+
+    public function testRename(): void
+    {
+        $this->adapterMock->expects(self::once())
+            ->method('move')
+            ->with('test/path', 'test/path2');
+
+        self::assertTrue($this->driver->rename('test/path', 'test/path2'));
+    }
+
+    public function testRenameSameDestination(): void
+    {
+        $this->adapterMock->expects(self::never())
+            ->method('move');
+
+        self::assertTrue($this->driver->rename('test/path', 'test/path'));
+    }
 }

app/code/Magento/AdvancedSearch/README.md

@@ -112,5 +112,6 @@
         <element name="categoriesLabel" type="text" selector="//div[@class='action-menu _active']//button[@data-action='close-advanced-select']"/>
         <element name="userDefinedQuantity" type="checkbox" selector="[name='bundle_options[bundle_options][{{option}}][bundle_selections][{{product}}][selection_can_change_qty]'][type='checkbox']" parameterized="true"/>
         <element name="bundleItemsOptionTableRows" type="button" selector=".admin__dynamic-rows[data-index='bundle_selections'] tr.data-row" timeout="30"/>
+        <element name="isDefault" type="button" selector="//table[@class='admin__dynamic-rows admin__control-table']//span[contains(text(),'{{var1}}')]/../../../../..//input[@type='radio']" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Collection.php

@@ -40,8 +40,11 @@
 
         <!-- Go to new product page and see a default attribute -->
         <!-- Switch from default attribute set to new attribute set -->
-        <amOnPage url="{{AdminProductCreatePage.url('4', 'bundle')}}" stepKey="goToNewProductPage"/>
-        <waitForPageLoad stepKey="wait2"/>
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToNewProductPage">
+            <argument name="attributeSetId" value="4"/>
+            <argument name="productType" value="bundle"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait2"/>
 
         <actionGroup ref="AdminSelectAttributeSetOnEditProductPageActionGroup" stepKey="startEditAttrSet">
             <argument name="attributeSet" value="{{ProductAttributeFrontendLabel.label}}"/>