MAGETWO-2204: "HEADERS ALREADY SENT" When Controller Action Outputs Directly

Author: vpaladiychuk

app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php

@@ -181,15 +181,11 @@ public function execute()
             $contentLength = $stat['size'];
             $contentModify = $stat['mtime'];
 
-            $this->getResponse()
-                ->setHttpResponseCode(200)
+            $resultRaw->setHttpResponseCode(200)
                 ->setHeader('Pragma', 'public', true)
                 ->setHeader('Content-type', $contentType, true)
                 ->setHeader('Content-Length', $contentLength)
-                ->setHeader('Last-Modified', date('r', $contentModify))
-                ->clearBody();
-            $this->getResponse()->sendHeaders();
-
+                ->setHeader('Last-Modified', date('r', $contentModify));
             $resultRaw->setContents($directory->readFile($fileName));
         } else {
             $name = pathinfo($path, PATHINFO_BASENAME);

dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/ViewfileTest.php

@@ -67,10 +67,99 @@ public function testExecuteParamFile()
         );
         $resultRawFactoryMock->expects($this->once())->method('create')->willReturn($resultRawMock);
 
+        $fileResponse = $this->getMock('Magento\Framework\App\ResponseInterface', [], [], '', false);
+        $fileFactoryMock = $this->getMock('Magento\Framework\App\Response\Http\FileFactory', [], [], '', false);
+        $fileFactoryMock->expects($this->once())->method('create')->with(
+            $path,
+            ['type' => 'filename', 'value' => $fileName],
+            \Magento\Framework\App\Filesystem\DirectoryList::MEDIA
+        )->willReturn($fileResponse);
+
+        /** @var \Magento\Customer\Controller\Adminhtml\Index\Viewfile $controller */
+        $controller = (new \Magento\TestFramework\Helper\ObjectManager($this))->getObject(
+            'Magento\Customer\Controller\Adminhtml\Index\Viewfile',
+            [
+                'context' => $contextMock,
+                'urlDecoder' => $urlDecoderMock,
+                'resultRawFactory' => $resultRawFactoryMock,
+                'fileFactory' => $fileFactoryMock
+            ]
+        );
+        $this->assertSame($resultRawMock, $controller->execute());
+        $this->assertSame($fileResponse, $controller->getResponse());
+    }
+
+    public function testExecuteGetParamImage()
+    {
+        $decodedFile = 'decoded_file';
+        $file = 'file';
+        $fileName = 'customer/' . $file;
+        $path = 'path';
+        $stat = ['size' => 10, 'mtime' => 10];
+
+        $requestMock = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
+        $requestMock->expects($this->at(0))->method('getParam')->with('file')->willReturn(null);
+        $requestMock->expects($this->at(1))->method('getParam')->with('image')->willReturn($decodedFile);
+        $requestMock->expects($this->at(2))->method('getParam')->with('image')->willReturn($decodedFile);
+
+        $responseMock = $this->getMock('Magento\Framework\App\ResponseInterface', [], [], '', false);
+
+        $directoryMock = $this->getMock('Magento\Framework\Filesystem\Directory\ReadInterface', [], [], '', false);
+        $directoryMock->expects($this->once())->method('getAbsolutePath')->with($fileName)->willReturn($path);
+        $directoryMock->expects($this->once())->method('stat')->with($path)->willReturn($stat);
+
+        $fileSystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
+        $fileSystemMock->expects($this->once())->method('getDirectoryRead')
+            ->with(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA)
+            ->willReturn($directoryMock);
+
+        $storage = $this->getMock('Magento\Core\Helper\File\Storage', [], [], '', false);
+        $storage->expects($this->once())->method('processStorageFile')->with($path)->willReturn(true);
+
+        $objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface', [], [], '', false);
+        $objectManager->expects($this->at(0))->method('get')->with('Magento\Framework\Filesystem')
+            ->willReturn($fileSystemMock);
+        $objectManager->expects($this->at(1))->method('get')->with('Magento\Core\Helper\File\Storage')
+            ->willReturn($storage);
+
+        $contextMock = $this->getMock('Magento\Backend\App\Action\Context', [], [], '', false);
+        $contextMock->expects($this->once())->method('getRequest')->willReturn($requestMock);
+        $contextMock->expects($this->once())->method('getResponse')->willReturn($responseMock);
+        $contextMock->expects($this->once())->method('getObjectManager')->willReturn($objectManager);
+
+        $urlDecoderMock = $this->getMock('Magento\Framework\Url\DecoderInterface', [], [], '', false);
+        $urlDecoderMock->expects($this->once())->method('decode')->with($decodedFile)->willReturn($file);
+
+        $resultRawMock = $this->getMock('Magento\Framework\Controller\Result\Raw', [], [], '', false);
+        $resultRawMock->expects($this->once())->method('setHttpResponseCode')->with(200)->willReturnSelf();
+        $resultRawMock->expects($this->at(1))->method('setHeader')->with('Pragma', 'public', true)->willReturnSelf();
+        $resultRawMock->expects($this->at(2))->method('setHeader')
+            ->with('Content-type', 'application/octet-stream', true)
+            ->willReturnSelf();
+        $resultRawMock->expects($this->at(3))->method('setHeader')
+            ->with('Content-Length', $stat['size'])
+            ->willReturnSelf();
+        $resultRawMock->expects($this->at(4))->method('setHeader')
+            ->with('Last-Modified', date('r', $stat['mtime']))
+            ->willReturnSelf();
+
+        $resultRawFactoryMock = $this->getMock(
+            'Magento\Framework\Controller\Result\RawFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+        $resultRawFactoryMock->expects($this->once())->method('create')->willReturn($resultRawMock);
+
         /** @var \Magento\Customer\Controller\Adminhtml\Index\Viewfile $controller */
         $controller = (new \Magento\TestFramework\Helper\ObjectManager($this))->getObject(
             'Magento\Customer\Controller\Adminhtml\Index\Viewfile',
-            ['context' => $contextMock, 'urlDecoder' => $urlDecoderMock, 'resultRawFactory' => $resultRawFactoryMock]
+            [
+                'context' => $contextMock,
+                'urlDecoder' => $urlDecoderMock,
+                'resultRawFactory' => $resultRawFactoryMock
+            ]
         );
         $this->assertSame($resultRawMock, $controller->execute());
     }