mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Additional work on tests, should pass now

Browse Source
This commit is contained in:
Ben Thomson 2020-08-17 16:41:49 +08:00
parent 1fd9529786
commit 0020809634
No known key found for this signature in database
GPG Key ID: 8BDB18DD0909BE22
2 changed files with 72 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/system/classes/ImageResizer.php
View File

@ -252,6 +252,20 @@ class ImageResizer
return static::$availableSources = $sources;
}
/**
* Flushes the local sources cache.
*
* @return void
*/
public static function flushAvailableSources()
{
if (empty(static::$availableSources)) {
return;
}
static::$availableSources = [];
}
/**
* Get the current config
*

66
tests/unit/system/classes/ImageResizerTest.php
View File

@ -5,14 +5,26 @@ use System\Classes\MediaLibrary;
use System\Models\File as FileModel;
use Cms\Classes\Controller as CmsController;
use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
use October\Rain\Exception\SystemException;
class ImageResizerTest extends PluginTestCase
{
use ArraySubsetAsserts;
public function setUp(): void
{
parent::setUp();
Event::flush('cms.theme.getActiveTheme');
Event::listen('cms.theme.getActiveTheme', function () {
return 'test';
});
}
public function tearDown(): void
{
$this->removeMedia();
ImageResizer::flushAvailableSources();
parent::tearDown();
}
@ -134,30 +146,68 @@ class ImageResizerTest extends PluginTestCase
);
$this->assertEquals('png', $imageResizer->getConfig()['options']['extension']);
// Still to test - FileModel URL and FileModel instance
// Path of a FileModel instance
$fileModel = new FileModel();
$fileModel->fromFile(base_path('tests/fixtures/plugins/database/tester/assets/images/avatar.png'));
$fileModel->save();
$imageResizer = new ImageResizer(
FileModel::first()->getPath(),
100,
100,
);
$this->assertEquals('png', $imageResizer->getConfig()['options']['extension']);
// FileModel instance itself
$imageResizer = new ImageResizer(
$fileModel,
100,
100,
);
$this->assertEquals('png', $imageResizer->getConfig()['options']['extension']);
// Remove FileModel instance
$fileModel->delete();
}
public function testInvalidInput()
public function testInvalidInputPath()
{
$this->markTestIncomplete();
$this->expectException(SystemException::class);
$this->expectExceptionMessageMatches('/^Unable to process the provided image/');
$providedPath = '/plugins/october/demo/assets/NOTPRESENT.png';
$imageResizer = new ImageResizer(
'/plugins/database/tester/assets/images/MISSING.png',
100,
100,
);
}
public function testInvalidInputFileModel()
{
$this->expectException(SystemException::class);
$this->expectExceptionMessageMatches('/^Unable to process the provided image/');
$imageResizer = new ImageResizer(
FileModel::first(),
100,
100,
);
}
protected function setUpStorage()
{
$this->app->useStoragePath(base_path('storage/temp'));
config(['filesystems.disks.test_local' => [
Config::set('filesystems.disks.test_local', [
'driver' => 'local',
'root' => storage_path('app'),
]]);
]);
config(['cms.storage.media' => [
Config::set('cms.storage.media', [
'disk' => 'test_local',
'folder' => 'media',
'path' => '/storage/temp/app/media',
]]);
]);
}
protected function copyMedia()