magento/adobe-stock-integration#1504: Extracted logic from wysiwyg OnInsert controller to a model - PR suggestions and Adjustments on Integration test

Author: jmonteros422

app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php

@@ -45,15 +45,20 @@ public function execute()
     {
         $data = $this->getRequest()->getParams();
 
+        $fileName = $data['filename'];
+        $forceStaticPath = $data['force_static_path'];
+        $renderAsTag = $data['as_is'];
+        $storeId = isset($data['store_id']) ? (int) $data['store_id'] : null;
+
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
 
         return $resultRaw->setContents(
             $this->getInsertImageContent->execute(
-                $data['filename'],
-                $data['force_static_path'],
-                $data['as_is'],
-                isset($data['store_id']) ? (int) $data['store_id'] : null
+                $fileName,
+                $forceStaticPath,
+                $renderAsTag,
+                $storeId
             )
         );
     }

app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php

@@ -8,7 +8,6 @@
 
 namespace Magento\Cms\Model\Wysiwyg\Images;
 
-use Magento\Catalog\Helper\Data;
 use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
 
 class GetInsertImageContent
@@ -18,23 +17,14 @@ class GetInsertImageContent
      */
     private $imagesHelper;
 
-    /**
-     * @var Data
-     */
-    private $catalogHelper;
-
     /**
      * PrepareImage constructor.
      *
      * @param ImagesHelper $imagesHelper
-     * @param Data $catalogHelper
      */
-    public function __construct(
-        ImagesHelper $imagesHelper,
-        Data $catalogHelper
-    ) {
+    public function __construct(ImagesHelper $imagesHelper)
+    {
         $this->imagesHelper = $imagesHelper;
-        $this->catalogHelper = $catalogHelper;
     }
 
     /**
@@ -54,7 +44,6 @@ public function execute(
     ): string {
         $filename = $this->imagesHelper->idDecode($encodedFilename);
 
-        $this->catalogHelper->setStoreId($storeId);
         $this->imagesHelper->setStoreId($storeId);
 
         if ($forceStaticPath) {

app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php

@@ -8,8 +8,10 @@
 
 namespace Magento\Cms\Test\Integration\Model\Wysiwyg\Images;
 
+use Magento\Backend\Helper\Data as BackendHelper;
 use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
 use Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent;
+use Magento\Framework\Url\EncoderInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -27,13 +29,25 @@ class GetInsertImageContentTest extends TestCase
      */
     private $imagesHelper;
 
+    /**
+     * @var EncoderInterface
+     */
+    private $urlEncoder;
+
+    /**
+     * @var BackendHelper
+     */
+    protected $_backendData;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         $this->getInsertImageContent = Bootstrap::getObjectManager()->get(GetInsertImageContent::class);
         $this->imagesHelper = Bootstrap::getObjectManager()->get(ImagesHelper::class);
+        $this->urlEncoder = Bootstrap::getObjectManager()->get(EncoderInterface::class);
+        $this->_backendData = Bootstrap::getObjectManager()->get(BackendHelper::class);
     }
 
     /**
@@ -44,12 +58,14 @@ protected function setUp(): void
      * @param bool $forceStaticPath
      * @param bool $renderAsTag
      * @param int|null $storeId
+     * @param string|null $expectedResult
      */
     public function testExecute(
         string $encodedFilename,
         bool $forceStaticPath,
         bool $renderAsTag,
-        ?int $storeId = null
+        ?int $storeId = null,
+        ?string $expectedResult = null
     ): void {
         $getImageForInsert = $this->getInsertImageContent->execute(
             $encodedFilename,
@@ -58,35 +74,21 @@ public function testExecute(
             $storeId
         );
 
-        if (!$forceStaticPath) {
-            if ($renderAsTag) {
-                $html = $this->imagesHelper->getImageHtmlDeclaration(
-                    self::TEST_IMAGE_FILE,
-                    true
-                );
-                $this->assertEquals(
-                    $getImageForInsert,
-                    $html
-                );
-            } else {
-                $html = $this->imagesHelper->getImageHtmlDeclaration(
-                    self::TEST_IMAGE_FILE,
-                    false
-                );
-                $this->assertEquals(
-                    $getImageForInsert,
-                    $html
+        if (!$forceStaticPath && !$renderAsTag) {
+            if (!$this->imagesHelper->isUsingStaticUrlsAllowed()) {
+
+                $encodedDirective = $this->urlEncoder->encode($expectedResult);
+                $expectedResult = $this->_backendData->getUrl(
+                    'cms/wysiwyg/directive',
+                    [
+                        '___directive' => $encodedDirective,
+                        '_escape_params' => false,
+                    ]
                 );
             }
-        } else {
-            $this->assertEquals(
-                $getImageForInsert,
-                parse_url(
-                    $this->imagesHelper->getCurrentUrl() . self::TEST_IMAGE_FILE,
-                    PHP_URL_PATH
-                )
-            );
         }
+
+        $this->assertEquals($getImageForInsert, $expectedResult);
     }
 
     /**
@@ -102,30 +104,35 @@ public function imageDataProvider(): array
                 false,
                 true,
                 1,
+                '<img src="{{media url=&quot;' . self::TEST_IMAGE_FILE . '&quot;}}" alt="" />'
             ],
             [
                 'L3Rlc3QtaW1hZ2UuanBn',
                 true,
                 false,
                 1,
+                '/pub/media/' . self::TEST_IMAGE_FILE
             ],
             [
                 'L3Rlc3QtaW1hZ2UuanBn',
                 false,
                 false,
                 1,
+                '{{media url="' . self::TEST_IMAGE_FILE . '"}}'
             ],
             [
                 'L3Rlc3QtaW1hZ2UuanBn',
                 false,
                 true,
                 2,
+                '<img src="{{media url=&quot;' . self::TEST_IMAGE_FILE . '&quot;}}" alt="" />'
             ],
             [
                 'L3Rlc3QtaW1hZ2UuanBn',
                 false,
                 true,
                 null,
+                '<img src="{{media url=&quot;' . self::TEST_IMAGE_FILE . '&quot;}}" alt="" />'
             ],
         ];
     }