Skip to content

Commit 0be1c79

Browse files
committed
ACP2E-1353: allow image/x-icon favicon
1 parent 7c349cc commit 0be1c79

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/ThemeControllerTest.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,15 @@ public function testUploadFaviconAction()
3939
$this->getRequest()->setPostValue('id', $theme->getId());
4040
$this->dispatch('backend/admin/design_config_fileUploader/save');
4141
$output = $this->getResponse()->getBody();
42-
$this->assertStringContainsString('"error":"false"', $output);
43-
$this->assertStringContainsString($name, $output);
42+
if (in_array('imagick', get_loaded_extensions())) {
43+
$this->assertStringContainsString('"error":"false"', $output);
44+
$this->assertStringContainsString($name, $output);
45+
} else {
46+
$this->assertStringContainsString(
47+
'"error":"Required PHP extension \'Imagick\' was not loaded."',
48+
$output
49+
);
50+
}
4451
}
4552
}
4653

0 commit comments

Comments
 (0)