MAGETWO-38065: /magento_verion exposes too detailed version information

Author: Dale Sikkema

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

@@ -31,15 +31,18 @@ public function __construct(Context $context, ProductMetadataInterface $productM
     }
 
     /**
-     * Sets the response body with ProductName/Version (Edition). E.g.: Magento/0.42.0-beta3 (Community)
+     * Sets the response body to ProductName/Major.MinorVersion (Edition). E.g.: Magento/0.42 (Community). Omits patch
+     * version from response
      *
      * @return void
      */
     public function execute()
     {
+        $fullVersion = explode('.', $this->productMetadata->getVersion());
+        $majorMinorVersion = $fullVersion[0] . '.' . $fullVersion[1];
         $this->getResponse()->setBody(
             $this->productMetadata->getName() . '/' .
-            $this->productMetadata->getVersion() . ' (' .
+            $majorMinorVersion . ' (' .
             $this->productMetadata->getEdition() . ')'
         );
     }

dev/tests/integration/testsuite/Magento/Version/Controller/Index/IndexTest.php

@@ -0,0 +1,33 @@
+<?php
+/***
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+class IndexTest extends \Magento\TestFramework\TestCase\AbstractController
+{
+    public function testExecute()
+    {
+        // Execute controller to get version response
+        $this->dispatch('magento_version');
+        $body = $this->getResponse()->getBody();
+
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Framework\App\ProductMetadataInterface $productMetadata */
+        $productMetadata = $objectManager->get('Magento\Framework\App\ProductMetadataInterface');
+        $name = $productMetadata->getName();
+        $edition = $productMetadata->getEdition();
+
+        $fullVersion = $productMetadata->getVersion();
+        $versionParts = explode('.', $fullVersion);
+        $majorMinor = $versionParts[0] . '.' . $versionParts[1];
+
+        // Response must contain Major.Minor version, product name, and edition
+        $this->assertContains($majorMinor, $body);
+        $this->assertContains($name, $body);
+        $this->assertContains($edition, $body);
+
+        // Response must not contain full version including patch version
+        $this->assertNotContains($fullVersion, $body);
+    }
+}