B2B-2036: [AWS S3] [Integration Tests]: Investigate Test Failures in MediaGalleryRenditions module

Author: oshmyheliuk

app/code/Magento/MediaGalleryRenditions/Model/GenerateRenditions.php

@@ -205,7 +205,7 @@ private function createResizedRendition(string $absolutePath, string $absoluteRe
      */
     private function shouldFileBeResized(string $absolutePath): bool
     {
-        [$width, $height] = getimagesize($absolutePath);
+        [$width, $height] = getimagesizefromstring($this->getMediaDirectory()->readFile($absolutePath));
         return $width > $this->config->getWidth() || $height > $this->config->getHeight();
     }
 

app/code/Magento/MediaGalleryRenditions/Test/Integration/Model/GenerateRenditionsTest.php

@@ -63,7 +63,7 @@ protected function setup(): void
         $this->mediaDirectory = $this->objectManager->get(Filesystem::class)
             ->getDirectoryWrite(DirectoryList::MEDIA);
         $this->mediaDirectory->create(self::TEST_DIR);
-        $this->driver = $this->objectManager->get(DriverInterface::class);
+        $this->driver = $this->mediaDirectory->getDriver();
         $this->renditionSizeConfig = $this->objectManager->get(Config::class);
         $config = $this->objectManager->get(ScopeConfigInterface::class);
         $this->origConfigValue = $config->getValue(
@@ -114,10 +114,9 @@ public static function tearDownAfterClass(): void
     public function testExecute(string $path, string $renditionPath): void
     {
         $this->copyImage($path);
-        $this->generateRenditions->execute([self::TEST_DIR . '/' . $path]);
-        $expectedRenditionPath = $this->mediaDirectory->getAbsolutePath($renditionPath);
-        list($imageWidth, $imageHeight) = getimagesize($expectedRenditionPath);
-        $this->assertFileExists($expectedRenditionPath);
+        $this->generateRenditions->execute([self::TEST_DIR . $path]);
+        list($imageWidth, $imageHeight) = getimagesizefromstring($this->mediaDirectory->readFile($renditionPath));
+        $this->assertTrue($this->mediaDirectory->isExist($renditionPath));
         $this->assertLessThanOrEqual(
             $this->renditionSizeConfig->getWidth(),
             $imageWidth,
@@ -136,11 +135,11 @@ public function testExecute(string $path, string $renditionPath): void
      */
     private function copyImage(string $path): void
     {
-        $imagePath = realpath(__DIR__ . '/../../_files' . $path);
-        $modifiableFilePath = $this->mediaDirectory->getAbsolutePath(self::TEST_DIR . $path );
-        $this->driver->copy(
-            $imagePath,
-            $modifiableFilePath
+        $imagePath = realpath(__DIR__ . '/../../_files/' . $path);
+        $modifiableFilePath = $this->mediaDirectory->getAbsolutePath(self::TEST_DIR . $path);
+        $this->driver->filePutContents(
+            $modifiableFilePath,
+            file_get_contents($imagePath)
         );
     }
 

app/code/Magento/MediaGalleryRenditions/Test/Integration/Model/GetRenditionPathTest.php

@@ -39,7 +39,7 @@ protected function setup(): void
         $this->getRenditionPath = Bootstrap::getObjectManager()->get(GetRenditionPathInterface::class);
         $this->mediaDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
             ->getDirectoryWrite(DirectoryList::MEDIA);
-        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+        $this->driver = $this->mediaDirectory->getDriver();
     }
 
     /**
@@ -51,9 +51,10 @@ public function testExecute(string $path, string $expectedRenditionPath): void
     {
         $imagePath = realpath(__DIR__ . '/../../_files' . $path);
         $modifiableFilePath = $this->mediaDirectory->getAbsolutePath($path);
-        $this->driver->copy(
-            $imagePath,
-            $modifiableFilePath
+        $this->mediaDirectory->create(dirname($path));
+        $this->driver->filePutContents(
+            $modifiableFilePath,
+            file_get_contents($imagePath)
         );
         $this->assertEquals($expectedRenditionPath, $this->getRenditionPath->execute($path));
     }