Skip to content

Commit aea41d7

Browse files
committed
MAGETWO-44227: set area for integration test
1 parent 9944fd7 commit aea41d7

File tree

2 files changed

+11
-8
lines changed
  • app/code/Magento/Catalog/Model/Product
  • dev/tests/integration/testsuite/Magento/Catalog/controllers/_files

2 files changed

+11
-8
lines changed

app/code/Magento/Catalog/Model/Product/Image.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -942,15 +942,11 @@ public function getResizedImageInfo()
942942
{
943943
$fileInfo = null;
944944
if ($this->_newFile === true) {
945-
$sourceFile = $this->_assetRepo->createAsset(
945+
$asset = $this->_assetRepo->createAsset(
946946
"Magento_Catalog::images/product/placeholder/{$this->getDestinationSubdir()}.jpg"
947-
)->getSourceFile();
948-
if ($this->_mediaDirectory->isFile($sourceFile)) {
949-
try {
950-
$fileInfo = getimagesize($sourceFile);
951-
} catch (Exception $e) {
952-
}
953-
}
947+
);
948+
$img = $asset->getSourceFile();
949+
$fileInfo = getimagesize($img);
954950
} else {
955951
if ($this->_mediaDirectory->isFile($this->_mediaDirectory->getAbsolutePath($this->_newFile))) {
956952
$fileInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($this->_newFile));

dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
use Magento\Framework\App\Filesystem\DirectoryList;
1010

1111
$obectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
12+
13+
$obectManager->get(
14+
'Magento\Framework\View\DesignInterface'
15+
)->setArea(
16+
'frontend'
17+
)->setDefaultDesignTheme();
18+
1219
/** @var \Magento\Catalog\Model\Product\Media\Config $config */
1320
$config = $obectManager->get('Magento\Catalog\Model\Product\Media\Config');
1421
/** @var \Magento\Framework\Filesystem\Directory\WriteInterface $mediaDirectory */

0 commit comments

Comments
 (0)