Fixed test errors

mage-os · Jan 19, 2025 · de902a9 · de902a9
1 parent a1bced7
commit de902a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/code/Magento/Version/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Version/Test/Unit/Controller/Index/IndexTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void
 
         $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getName', 'getEdition', 'getVersion'])
+            ->setMethods(['getName', 'getEdition', 'getVersion', 'getDistributionName', 'getDistributionVersion'])
             ->getMockForAbstractClass();
 
         $this->rawResponseFactoryMock = $this->createPartialMock(RawFactory::class, ['create']);
@@ -78,9 +78,13 @@ public function testCommunityVersionDisplaysMajorMinorVersionAndEditionName(): v
         $this->productMetadataMock->expects($this->any())->method('getVersion')->willReturn('2.3.3');
         $this->productMetadataMock->expects($this->any())->method('getEdition')->willReturn('Community');
         $this->productMetadataMock->expects($this->any())->method('getName')->willReturn('Magento');
+        $this->productMetadataMock->expects($this->any())->method('getDistributionVersion')
+            ->willReturn('1.1.0');
+        $this->productMetadataMock->expects($this->any())->method('getDistributionName')
+            ->willReturn('Mage-OS');
 
         $this->rawResponseMock->expects($this->once())->method('setContents')
-            ->with('Magento/2.3 (Community)')
+            ->with('Mage-OS/1.1 (Community)')
             ->willReturnSelf();
 
         $this->versionController->execute();

diff --git a/dev/tests/integration/testsuite/Magento/Version/Controller/Index/IndexTest.php b/dev/tests/integration/testsuite/Magento/Version/Controller/Index/IndexTest.php
@@ -16,10 +16,10 @@ public function testIndexAction()
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var \Magento\Framework\App\ProductMetadataInterface $productMetadata */
         $productMetadata = $objectManager->get(\Magento\Framework\App\ProductMetadataInterface::class);
-        $name = $productMetadata->getName();
+        $name = $productMetadata->getDistributionName();
         $edition = $productMetadata->getEdition();
 
-        $fullVersion = $productMetadata->getVersion();
+        $fullVersion = $productMetadata->getDistributionVersion();
         if ($this->isComposerBasedInstallation($fullVersion)) {
             $versionParts = explode('.', $fullVersion);
             $majorMinor = $versionParts[0] . '.' . $versionParts[1];