Merge branch '2.4.4-develop' into ph-delivery

Author: xmav

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

@@ -99,6 +99,18 @@ public function copy($source, $destination): void
         $this->helperInstance->copy($this->extractFilePath($source), $this->extractFilePath($destination));
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $source - path to local file or json structure with paths by storage type.
+     * @param string $destination - path to file or json structure with paths by storage type.
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function copyFromLocal($source, $destination): void
+    {
+        $this->helperInstance->copyFromLocal($this->extractFilePath($source), $this->extractFilePath($destination));
+    }
+
     /**
      * Create directory in the storage
      *

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

@@ -44,6 +44,17 @@ public function deleteFileIfExists($filePath): void;
      */
     public function copy($source, $destination): void;
 
+    /**
+     * Copy file from the local source into local or remote destination depends on storage FS
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function copyFromLocal($source, $destination): void;
+
     /**
      * Create directory in the storage
      *

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

@@ -110,6 +110,23 @@ public function copy($source, $destination): void
         $this->driver->copy($source, $destination);
     }
 
+    /**
+     * Copy file from the local source into AWS S3 $destination
+     *
+     * @param string $source local FS path to the file which should be copied
+     * @param string $destination path on AWS S3 where the file should be paste
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function copyFromLocal($source, $destination): void
+    {
+        $this->driver->filePutContents(
+            $destination,
+            file_get_contents((substr($source, 0, 1) === '/') ? $source : MAGENTO_BP . '/' . $source)
+        );
+    }
+
     /**
      * Create directory in the S3 bucket
      *
@@ -165,7 +182,10 @@ public function assertFileExists($filePath, $message = ''): void
     public function assertGlobbedFileExists($path, $pattern, $message = ''): void
     {
         $files = $this->driver->search($pattern, $path);
-        $this->assertNotEmpty($files, "Failed asserting file matching glob pattern \"$pattern\" at location \"$path\" is not empty. " . $message);
+        $this->assertNotEmpty(
+            $files,
+            "Failed asserting file matching glob pattern \"$pattern\" at location \"$path\" is not empty. " . $message
+        );
     }
 
     /**
@@ -221,7 +241,10 @@ public function assertFileDoesNotExist($filePath, $message = ''): void
      */
     public function assertFileEmpty($filePath, $message = ''): void
     {
-        $this->assertEmpty($this->driver->fileGetContents($filePath), "Failed asserting $filePath is empty. " . $message);
+        $this->assertEmpty(
+            $this->driver->fileGetContents($filePath),
+            "Failed asserting $filePath is empty. " . $message
+        );
     }
 
     /**
@@ -235,7 +258,10 @@ public function assertFileEmpty($filePath, $message = ''): void
      */
     public function assertFileNotEmpty($filePath, $message = ''): void
     {
-        $this->assertNotEmpty($this->driver->fileGetContents($filePath), "Failed asserting $filePath is not empty. " . $message);
+        $this->assertNotEmpty(
+            $this->driver->fileGetContents($filePath),
+            "Failed asserting $filePath is not empty. " . $message
+        );
     }
 
     /**
@@ -250,11 +276,16 @@ public function assertFileNotEmpty($filePath, $message = ''): void
      */
     public function assertFileContainsString($filePath, $text, $message = ''): void
     {
-        $this->assertStringContainsString($text, $this->driver->fileGetContents($filePath), "Failed asserting $filePath contains $text. " . $message);
+        $this->assertStringContainsString(
+            $text,
+            $this->driver->fileGetContents($filePath),
+            "Failed asserting $filePath contains $text. " . $message
+        );
     }
 
     /**
-     * Asserts that a file with the given glob pattern at the given path on the remote storage system contains a given string
+     * Asserts that a file with the given glob pattern at the given path
+     * on the remote storage system contains a given string
      *
      * @param string $path
      * @param string $pattern
@@ -268,7 +299,12 @@ public function assertFileContainsString($filePath, $text, $message = ''): void
     public function assertGlobbedFileContainsString($path, $pattern, $text, $fileIndex = 0, $message = ''): void
     {
         $files = $this->driver->search($pattern, $path);
-        $this->assertStringContainsString($text, $this->driver->fileGetContents($files[$fileIndex] ?? ''), "Failed asserting file of index \"$fileIndex\" matching glob pattern \"$pattern\" at location \"$path\" contains $text. " . $message);
+        $this->assertStringContainsString(
+            $text,
+            $this->driver->fileGetContents($files[$fileIndex] ?? ''),
+            "Failed asserting file of index \"$fileIndex\" matching glob pattern \"$pattern\""
+            . " at location \"$path\" contains $text. " . $message
+        );
     }
 
     /**
@@ -283,7 +319,11 @@ public function assertGlobbedFileContainsString($path, $pattern, $text, $fileInd
      */
     public function assertFileDoesNotContainString($filePath, $text, $message = ''): void
     {
-        $this->assertStringNotContainsString($text, $this->driver->fileGetContents($filePath), "Failed asserting $filePath does not contain $text. " . $message);
+        $this->assertStringNotContainsString(
+            $text,
+            $this->driver->fileGetContents($filePath),
+            "Failed asserting $filePath does not contain $text. " . $message
+        );
     }
 
     /**

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportBundleProductTest.xml

@@ -24,6 +24,7 @@
             <testCaseId value="MC-38558"/>
             <group value="importExport"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
         </annotations>
 
         <before>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportDownloadableProductWithFileLinksTest.xml

@@ -25,6 +25,7 @@
             <testCaseId value="MC-38558"/>
             <group value="importExport"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
         </annotations>
 
         <before>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportDownloadableProductWithURLLinksTest.xml

@@ -25,6 +25,7 @@
             <testCaseId value="MC-38558"/>
             <group value="importExport"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
         </annotations>
 
         <before>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportGroupedProductWithSpecialPriceTest.xml

@@ -24,6 +24,7 @@
             <testCaseId value="MC-38558"/>
             <group value="importExport"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
         </annotations>
 
         <before>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml

@@ -25,6 +25,7 @@
             <testCaseId value="MC-38558"/>
             <group value="importExport"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
         </annotations>
 
         <before>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml

@@ -25,6 +25,7 @@
             <testCaseId value="MC-38558"/>
             <group value="importExport"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
         </annotations>
 
         <before>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportTaxRatesTest.xml

@@ -25,6 +25,7 @@
             <group value="importExport"/>
             <group value="tax"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
             <group value="pr_exclude"/>
         </annotations>