Merge branch '2.4-develop' into PR_L3_March_24

Author: alzota

app/code/Magento/AwsS3/Test/Mftf/Helper/DummyMetadataCache.php

@@ -83,4 +83,11 @@ public function updateMetadata(string $path, array $objectMetadata, bool $persis
     public function storeFileNotExists(string $path): void
     {
     }
+
+    /**
+     * @inheirtDoc
+     */
+    public function storeDirNotExists(string $path): void
+    {
+    }
 }

app/code/Magento/AwsS3/Test/Mftf/Helper/S3FileAssertions.php

@@ -26,6 +26,11 @@ class S3FileAssertions extends Helper
      */
     private $driver;
 
+    /**
+     * @var AwsS3V3Adapter
+     */
+    private $adapter;
+
     /**
      * Call the parent constructor then create the AwsS3 driver from environment variables
      *
@@ -65,6 +70,7 @@ public function __construct(ModuleContainer $moduleContainer, ?array $config = n
         $s3Driver = new AwsS3($adapter, new MockTestLogger(), $objectUrl, $metadataProvider);
 
         $this->driver = $s3Driver;
+        $this->adapter = $adapter;
     }
 
     /**
@@ -196,10 +202,11 @@ public function assertGlobbedFileExists($path, $pattern, $message = ''): void
      * @return void
      *
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \League\Flysystem\FilesystemException
      */
     public function assertDirectoryExists($path, $message = ''): void
     {
-        $this->assertTrue($this->driver->isDirectory($path), "Failed asserting $path exists. " . $message);
+        $this->assertTrue($this->adapter->directoryExists($path), "Failed asserting $path exists. " . $message);
     }
 
     /**

app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

@@ -439,8 +439,8 @@ public function testSearchDirectory(): void
         $this->metadataProviderMock->expects(self::any())->method('getMetadata')
             ->willReturnMap([
                 ['path', ['type' => AwsS3::TYPE_DIR]],
-                ['path/1', ['type' => AwsS3::TYPE_FILE]],
-                ['path/2', ['type' => AwsS3::TYPE_FILE]],
+                ['path/1', ['type' => AwsS3::TYPE_DIR]],
+                ['path/2', ['type' => AwsS3::TYPE_DIR]],
             ]);
         $this->adapterMock->expects(self::atLeastOnce())->method('listContents')
             ->willReturn(new \ArrayIterator($subPaths));

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

@@ -1912,9 +1912,7 @@ protected function _saveTitles(array $titles)
             if (!isset($existingOptionIds[$optionId]) && count($storeInfo) > 0) {
                 $storeInfo = [Store::DEFAULT_STORE_ID => reset($storeInfo)] + $storeInfo;
             }
-            //for use default
-            $uniqStoreInfo = array_unique($storeInfo);
-            foreach ($uniqStoreInfo as $storeId => $title) {
+            foreach ($storeInfo as $storeId => $title) {
                 $titleRows[] = ['option_id' => $optionId, 'store_id' => $storeId, 'title' => $title];
             }
         }

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClearCustomersFiltersActionGroup.xml

@@ -16,5 +16,6 @@
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <waitForPageLoad stepKey="waitForCustomersFilterToBeDeleted"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml

@@ -30,6 +30,7 @@
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="resetCustomerFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- -

app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml

@@ -28,6 +28,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml

@@ -27,6 +27,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml

@@ -27,6 +27,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/Customer/Test/Mftf/Test/AdminEditCustomerWithAssociatedNewsletterQueueNewTest.xml

@@ -37,6 +37,8 @@
             <actionGroup ref="AdminMarketingOpenNewsletterTemplateFromGridActionGroup" stepKey="openTemplate"/>
             <actionGroup ref="AdminMarketingDeleteNewsletterTemplateActionGroup" stepKey="deleteTemplate"/>
 
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
+
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>