Fix failing Integration test

Author: lbajsarowicz

app/code/Magento/Version/Controller/Index/Index.php

@@ -1,19 +1,18 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 namespace Magento\Version\Controller\Index;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\ProductMetadataInterface;
-use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\Result\RawFactory as RawResponseFactory;
 
 /**
- * Magento Version controller
+ * Magento Version controller: Sets the response body to ProductName/Major.MinorVersion (Edition).
  */
 class Index implements HttpGetActionInterface
 {
@@ -22,40 +21,41 @@ class Index implements HttpGetActionInterface
     /**
      * @var ProductMetadataInterface
      */
-    protected $productMetadata;
+    private $productMetadata;
+
     /**
-     * @var ResponseInterface
+     * @var RawResponseFactory
      */
-    private $response;
+    private $rawFactory;
 
     /**
-     * @param ResponseInterface $response
+     * @param RawResponseFactory $rawFactory
      * @param ProductMetadataInterface $productMetadata
      */
-    public function __construct(ResponseInterface $response, ProductMetadataInterface $productMetadata)
+    public function __construct(RawResponseFactory $rawFactory, ProductMetadataInterface $productMetadata)
     {
+        $this->rawFactory = $rawFactory;
         $this->productMetadata = $productMetadata;
-        $this->response = $response;
     }
 
     /**
-     * Sets the response body to ProductName/Major.MinorVersion (Edition).
-     *
-     * @return void
+     * @inheritDoc
      */
-    public function execute(): void
+    public function execute()
     {
+        $rawResponse = $this->rawFactory->create();
+
         $version = $this->productMetadata->getVersion();
         $versionParts = explode('.', $version);
-        if ($this->isGitBasedInstallation($version) || !$this->isCorrectVersion($versionParts)) {
-            return;
+        if (!$this->isGitBasedInstallation($version) && $this->isCorrectVersion($versionParts)) {
+            $rawResponse->setContents(
+                $this->productMetadata->getName() . '/' .
+                $this->getMajorMinorVersion($versionParts) .
+                ' (' . $this->productMetadata->getEdition() . ')'
+            );
         }
 
-        $this->response->setBody(
-            $this->productMetadata->getName() . '/' .
-            $this->getMajorMinorVersion($versionParts) .
-            ' (' . $this->productMetadata->getEdition() . ')'
-        );
+        return $rawResponse;
     }
 
     /**

app/code/Magento/Version/Test/Unit/Controller/Index/IndexTest.php

@@ -9,25 +9,25 @@
 
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\Result\Raw;
+use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Version\Controller\Index\Index as VersionIndex;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class IndexTest extends TestCase
 {
-    /**
-     * @var VersionIndex
-     */
+    /** @var VersionIndex */
     private $versionController;
 
-    /**
-     * @var ProductMetadataInterface
-     */
+    /** @var MockObject|ProductMetadataInterface */
     private $productMetadataMock;
 
-    /**
-     * @var ResponseInterface
-     */
-    private $responseMock;
+    /** @var MockObject|RawFactory */
+    private $rawResponseFactoryMock;
+
+    /** @var MockObject|Raw */
+    private $rawResponseMock;
 
     /**
      * Prepare test preconditions
@@ -39,12 +39,11 @@ protected function setUp()
             ->setMethods(['getName', 'getEdition', 'getVersion'])
             ->getMock();
 
-        $this->responseMock = $this->getMockBuilder(ResponseInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['setBody', 'sendResponse'])
-            ->getMock();
+        $this->rawResponseFactoryMock = $this->createPartialMock(RawFactory::class, ['create']);
+        $this->rawResponseMock = $this->createPartialMock(Raw::class, ['setContents']);
+        $this->rawResponseFactoryMock->method('create')->willReturn($this->rawResponseMock);
 
-        $this->versionController = new VersionIndex($this->responseMock, $this->productMetadataMock);
+        $this->versionController = new VersionIndex($this->rawResponseFactoryMock, $this->productMetadataMock);
     }
 
     /**
@@ -56,10 +55,10 @@ public function testGitBasedInstallationDoesNotReturnVersion(): void
             ->method('getVersion')
             ->willReturn('dev-2.3');
 
-        $this->responseMock->expects($this->never())
-            ->method('setBody');
+        $this->rawResponseMock->expects($this->never())
+            ->method('setContents');
 
-        $this->assertNull($this->versionController->execute());
+        $this->versionController->execute();
     }
 
     /**
@@ -71,7 +70,7 @@ public function testCommunityVersionDisplaysMajorMinorVersionAndEditionName(): v
         $this->productMetadataMock->expects($this->any())->method('getEdition')->willReturn('Community');
         $this->productMetadataMock->expects($this->any())->method('getName')->willReturn('Magento');
 
-        $this->responseMock->expects($this->once())->method('setBody')
+        $this->rawResponseMock->expects($this->once())->method('setContents')
             ->with('Magento/2.3 (Community)')
             ->will($this->returnSelf());