Skip to content
Snippets Groups Projects
Commit cba3a76d authored by Andrii Dimov's avatar Andrii Dimov
Browse files

MAGETWO-59342: Merge branch 'MAGETWO-59342' of...

MAGETWO-59342: Merge branch 'MAGETWO-59342' of github.com:magento-performance/magento2ce into pr-develop
parents e9e137bd 497e7848
No related merge requests found
......@@ -62,7 +62,7 @@ class Config implements \Magento\Framework\View\ConfigInterface
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];
}
......
......@@ -40,17 +40,17 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
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,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment