ACP2E-2015: Customizable Option Image link is broken

Author: bubasuma

app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php

@@ -69,7 +69,7 @@ public function execute()
 
         return $this->_fileFactory->create(
             $fileName,
-            $backup->output(),
+            ['type' => 'filename', 'value' => $backup->getPath() . DIRECTORY_SEPARATOR . $backup->getFileName()],
             DirectoryList::VAR_DIR,
             'application/octet-stream',
             $backup->getSize()

app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php

@@ -115,7 +115,7 @@ protected function setUp(): void
             ->getMock();
         $this->backupModelMock = $this->getMockBuilder(Backup::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getTime', 'exists', 'getSize', 'output'])
+            ->setMethods(['getTime', 'exists', 'getSize', 'output', 'getPath', 'getFileName'])
             ->getMock();
         $this->dataHelperMock = $this->getMockBuilder(Data::class)
             ->disableOriginalConstructor()
@@ -169,8 +169,13 @@ public function testExecuteBackupFound()
         $type = 'db';
         $filename = 'filename';
         $size = 10;
-        $output = 'test';
-
+        $path = 'testpath';
+        $this->backupModelMock->expects($this->atLeastOnce())
+            ->method('getPath')
+            ->willReturn($path);
+        $this->backupModelMock->expects($this->atLeastOnce())
+            ->method('getFileName')
+            ->willReturn($filename);
         $this->backupModelMock->expects($this->atLeastOnce())
             ->method('getTime')
             ->willReturn($time);
@@ -180,9 +185,6 @@ public function testExecuteBackupFound()
         $this->backupModelMock->expects($this->atLeastOnce())
             ->method('getSize')
             ->willReturn($size);
-        $this->backupModelMock->expects($this->atLeastOnce())
-            ->method('output')
-            ->willReturn($output);
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap(
@@ -206,20 +208,14 @@ public function testExecuteBackupFound()
         $this->fileFactoryMock->expects($this->once())
             ->method('create')->with(
                 $filename,
-                null,
+                ['type' => 'filename', 'value' => $path . '/' . $filename],
                 DirectoryList::VAR_DIR,
                 'application/octet-stream',
                 $size
             )
             ->willReturn($this->responseMock);
-        $this->resultRawMock->expects($this->once())
-            ->method('setContents')
-            ->with($output);
-        $this->resultRawFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($this->resultRawMock);
 
-        $this->assertSame($this->resultRawMock, $this->downloadController->execute());
+        $this->assertSame($this->responseMock, $this->downloadController->execute());
     }
 
     /**

app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\ImportExport\Model\Import;
 
 /**
  * Download history controller
@@ -62,7 +63,7 @@ public function execute()
 
         return $this->fileFactory->create(
             $fileName,
-            $reportHelper->getReportOutput($fileName),
+            ['type' => 'filename', 'value' => Import::IMPORT_HISTORY_DIR . $fileName],
             DirectoryList::VAR_IMPORT_EXPORT,
             'application/octet-stream',
             $reportHelper->getReportSize($fileName)

app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php

@@ -9,14 +9,17 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\Result\Raw;
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\ImportExport\Controller\Adminhtml\History\Download;
 use Magento\ImportExport\Helper\Report;
+use Magento\ImportExport\Model\Import;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -155,8 +158,20 @@ public function testExecute($requestFilename, $processedFilename)
         $this->reportHelper->method('importFileExists')
             ->with($processedFilename)
             ->willReturn(true);
-        $this->resultRaw->expects($this->once())->method('setContents');
-        $this->downloadController->execute();
+
+        $responseMock = $this->getMockBuilder(ResponseInterface::class)
+            ->getMock();
+        $this->fileFactory->expects($this->once())
+            ->method('create')
+            ->with(
+                $processedFilename,
+                ['type' => 'filename', 'value' =>Import::IMPORT_HISTORY_DIR . $processedFilename],
+                DirectoryList::VAR_IMPORT_EXPORT,
+                'application/octet-stream',
+                1
+            )
+            ->willReturn($responseMock);
+        $this->assertSame($responseMock, $this->downloadController->execute());
     }
 
     /**

app/code/Magento/Sales/Test/Unit/Controller/Download/DownloadCustomOptionTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\Result\Forward;
 use Magento\Framework\Controller\Result\ForwardFactory;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -24,32 +25,32 @@ class DownloadCustomOptionTest extends TestCase
     /**
      * Option ID Test Value
      */
-    const OPTION_ID = '123456';
+    public const OPTION_ID = '123456';
 
     /**
      * Option Code Test Value
      */
-    const OPTION_CODE = 'option_123456';
+    public const OPTION_CODE = 'option_123456';
 
     /**
      * Option Product ID Value
      */
-    const OPTION_PRODUCT_ID = 'option_test_product_id';
+    public const OPTION_PRODUCT_ID = 'option_test_product_id';
 
     /**
      * Option Type Value
      */
-    const OPTION_TYPE = 'file';
+    public const OPTION_TYPE = 'file';
 
     /**
      * Option Value Test Value
      */
-    const OPTION_VALUE = 'option_test_value';
+    public const OPTION_VALUE = 'option_test_value';
 
     /**
      * Option Value Test Value
      */
-    const SECRET_KEY = 'secret_key';
+    public const SECRET_KEY = 'secret_key';
 
     /**
      * @var \Magento\Quote\Model\Quote\Item\Option|MockObject
@@ -95,7 +96,7 @@ protected function setUp(): void
 
         $this->downloadMock = $this->getMockBuilder(Download::class)
             ->disableOriginalConstructor()
-            ->setMethods(['downloadFile'])
+            ->setMethods(['createResponse'])
             ->getMock();
 
         $this->serializerMock = $this->getMockBuilder(Json::class)
@@ -199,7 +200,8 @@ public function testExecute($itemOptionValues, $productOptionValues, $noRouteOcc
                 ->willReturn($productOptionValues[self::OPTION_TYPE]);
         }
         if ($noRouteOccurs) {
-            $this->resultForwardMock->expects($this->once())->method('forward')->with('noroute')->willReturn(true);
+            $result = $this->resultForwardMock;
+            $this->resultForwardMock->expects($this->once())->method('forward')->with('noroute')->willReturnSelf();
         } else {
             $unserializeResult = [self::SECRET_KEY => self::SECRET_KEY];
 
@@ -208,14 +210,15 @@ public function testExecute($itemOptionValues, $productOptionValues, $noRouteOcc
                 ->with($itemOptionValues[self::OPTION_VALUE])
                 ->willReturn($unserializeResult);
 
+            $result = $this->getMockBuilder(ResponseInterface::class)
+                ->getMock();
             $this->downloadMock->expects($this->once())
-                ->method('downloadFile')
+                ->method('createResponse')
                 ->with($unserializeResult)
-                ->willReturn(true);
+                ->willReturn($result);
 
-            $this->objectMock->expects($this->once())->method('endExecute')->willReturn(true);
         }
-        $this->objectMock->execute();
+        $this->assertSame($result, $this->objectMock->execute());
     }
 
     /**