MAGETWO-59342: Merge branch 'MAGETWO-59342' of github.com:magento-performance/magento2ce into pr-develop

Author: andimov

lib/internal/Magento/Framework/View/Config.php

@@ -62,7 +62,7 @@ public function getViewConfig(array $params = [])
         if (isset($params['themeModel'])) {
             /** @var \Magento\Framework\View\Design\ThemeInterface $currentTheme */
             $currentTheme = $params['themeModel'];
-            $key = $currentTheme->getCode();
+            $key = $currentTheme->getFullPath();
             if (isset($this->viewConfigs[$key])) {
                 return $this->viewConfigs[$key];
             }

lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php

@@ -40,17 +40,17 @@ protected function setUp()
 
     public function testGetViewConfig()
     {
-        $themeCode = 2;
+        $themeCode = 'area/theme';
 
         $themeMock = $this->getMock(
             \Magento\Theme\Model\Theme::class,
-            ['getCode'],
+            ['getFullPath'],
             [],
             '',
             false
         );
         $themeMock->expects($this->atLeastOnce())
-            ->method('getCode')
+            ->method('getFullPath')
             ->will($this->returnValue($themeCode));
         $params = [
             'themeModel' => $themeMock,