Fixing the active state for the links with the same frontname

Author: eduard13

lib/internal/Magento/Framework/View/Element/Html/Link/Current.php

@@ -71,7 +71,7 @@ private function getMca()
         ];
 
         $parts = [];
-        $pathParts = explode('/', $this->getPath());
+        $pathParts = explode('/', trim($this->_request->getPathInfo(), '/'));
         foreach ($routeParts as $key => $value) {
             if (isset($pathParts[$key]) && $pathParts[$key] === $value) {
                 $parts[] = $value;

lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php

@@ -64,6 +64,9 @@ public function testIsCurrent()
         $path = 'test/index';
         $url = 'http://example.com/test/index';
 
+        $this->_requestMock->expects($this->once())
+            ->method('getPathInfo')
+            ->will($this->returnValue('/test/index/'));
         $this->_requestMock->expects($this->once())
             ->method('getModuleName')
             ->will($this->returnValue('test'));