Update Composer, update everything
This commit is contained in:
Oliver Davies
parent
ea3e94409f
commit
dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
|
|
@ -0,0 +1,74 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\FunctionalTests\Image;
|
||||
|
||||
use Drupal\Tests\BrowserTestBase;
|
||||
|
||||
/**
|
||||
* Tests image toolkit setup form.
|
||||
*
|
||||
* @group Image
|
||||
*/
|
||||
class ToolkitSetupFormTest extends BrowserTestBase {
|
||||
|
||||
/**
|
||||
* Admin user account.
|
||||
*
|
||||
* @var \Drupal\user\Entity\User
|
||||
*/
|
||||
protected $adminUser;
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['system', 'image_test'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->adminUser = $this->drupalCreateUser([
|
||||
'administer site configuration',
|
||||
]);
|
||||
$this->drupalLogin($this->adminUser);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test Image toolkit setup form.
|
||||
*/
|
||||
public function testToolkitSetupForm() {
|
||||
// Get form.
|
||||
$this->drupalGet('admin/config/media/image-toolkit');
|
||||
|
||||
// Test that default toolkit is GD.
|
||||
$this->assertFieldByName('image_toolkit', 'gd', 'The default image toolkit is GD.');
|
||||
|
||||
// Test changing the jpeg image quality.
|
||||
$edit = ['gd[image_jpeg_quality]' => '70'];
|
||||
$this->drupalPostForm(NULL, $edit, 'Save configuration');
|
||||
$this->assertEqual($this->config('system.image.gd')->get('jpeg_quality'), '70');
|
||||
|
||||
// Test changing the toolkit.
|
||||
$edit = ['image_toolkit' => 'test'];
|
||||
$this->drupalPostForm(NULL, $edit, 'Save configuration');
|
||||
$this->assertEqual($this->config('system.image')->get('toolkit'), 'test');
|
||||
$this->assertFieldByName('test[test_parameter]', '10');
|
||||
|
||||
// Test changing the test toolkit parameter.
|
||||
$edit = ['test[test_parameter]' => '0'];
|
||||
$this->drupalPostForm(NULL, $edit, 'Save configuration');
|
||||
$this->assertText(t('Test parameter should be different from 0.'), 'Validation error displayed.');
|
||||
$edit = ['test[test_parameter]' => '20'];
|
||||
$this->drupalPostForm(NULL, $edit, 'Save configuration');
|
||||
$this->assertEqual($this->config('system.image.test_toolkit')->get('test_parameter'), '20');
|
||||
|
||||
// Test access without the permission 'administer site configuration'.
|
||||
$this->drupalLogin($this->drupalCreateUser(['access administration pages']));
|
||||
$this->drupalGet('admin/config/media/image-toolkit');
|
||||
$this->assertResponse(403);
|
||||
}
|
||||
|
||||
}
|
||||
89
web/core/tests/Drupal/FunctionalTests/Image/ToolkitTest.php
Normal file
89
web/core/tests/Drupal/FunctionalTests/Image/ToolkitTest.php
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\FunctionalTests\Image;
|
||||
|
||||
/**
|
||||
* Tests image toolkit functions.
|
||||
*
|
||||
* @group Image
|
||||
*/
|
||||
class ToolkitTest extends ToolkitTestBase {
|
||||
|
||||
/**
|
||||
* Check that ImageToolkitManager::getAvailableToolkits() only returns
|
||||
* available toolkits.
|
||||
*/
|
||||
public function testGetAvailableToolkits() {
|
||||
$manager = $this->container->get('image.toolkit.manager');
|
||||
$toolkits = $manager->getAvailableToolkits();
|
||||
$this->assertTrue(isset($toolkits['test']), 'The working toolkit was returned.');
|
||||
$this->assertTrue(isset($toolkits['test:derived_toolkit']), 'The derived toolkit was returned.');
|
||||
$this->assertFalse(isset($toolkits['broken']), 'The toolkit marked unavailable was not returned');
|
||||
$this->assertToolkitOperationsCalled([]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests Image's methods.
|
||||
*/
|
||||
public function testLoad() {
|
||||
$image = $this->getImage();
|
||||
$this->assertTrue(is_object($image), 'Returned an object.');
|
||||
$this->assertEqual($image->getToolkitId(), 'test', 'Image had toolkit set.');
|
||||
$this->assertToolkitOperationsCalled(['parseFile']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test the image_save() function.
|
||||
*/
|
||||
public function testSave() {
|
||||
$this->assertFalse($this->image->save(), 'Function returned the expected value.');
|
||||
$this->assertToolkitOperationsCalled(['save']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test the image_apply() function.
|
||||
*/
|
||||
public function testApply() {
|
||||
$data = ['p1' => 1, 'p2' => TRUE, 'p3' => 'text'];
|
||||
$this->assertTrue($this->image->apply('my_operation', $data), 'Function returned the expected value.');
|
||||
|
||||
// Check that apply was called and with the correct parameters.
|
||||
$this->assertToolkitOperationsCalled(['apply']);
|
||||
$calls = $this->imageTestGetAllCalls();
|
||||
$this->assertEqual($calls['apply'][0][0], 'my_operation', "'my_operation' was passed correctly as operation");
|
||||
$this->assertEqual($calls['apply'][0][1]['p1'], 1, 'integer parameter p1 was passed correctly');
|
||||
$this->assertEqual($calls['apply'][0][1]['p2'], TRUE, 'boolean parameter p2 was passed correctly');
|
||||
$this->assertEqual($calls['apply'][0][1]['p3'], 'text', 'string parameter p3 was passed correctly');
|
||||
}
|
||||
|
||||
/**
|
||||
* Test the image_apply() function.
|
||||
*/
|
||||
public function testApplyNoParameters() {
|
||||
$this->assertTrue($this->image->apply('my_operation'), 'Function returned the expected value.');
|
||||
|
||||
// Check that apply was called and with the correct parameters.
|
||||
$this->assertToolkitOperationsCalled(['apply']);
|
||||
$calls = $this->imageTestGetAllCalls();
|
||||
$this->assertEqual($calls['apply'][0][0], 'my_operation', "'my_operation' was passed correctly as operation");
|
||||
$this->assertEqual($calls['apply'][0][1], [], 'passing no parameters was handled correctly');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests image toolkit operations inheritance by derivative toolkits.
|
||||
*/
|
||||
public function testDerivative() {
|
||||
$toolkit_manager = $this->container->get('image.toolkit.manager');
|
||||
$operation_manager = $this->container->get('image.toolkit.operation.manager');
|
||||
|
||||
$toolkit = $toolkit_manager->createInstance('test:derived_toolkit');
|
||||
|
||||
// Load an overwritten and an inherited operation.
|
||||
$blur = $operation_manager->getToolkitOperation($toolkit, 'blur');
|
||||
$invert = $operation_manager->getToolkitOperation($toolkit, 'invert');
|
||||
|
||||
$this->assertIdentical('foo_derived', $blur->getPluginId(), "'Blur' operation overwritten by derivative.");
|
||||
$this->assertIdentical('bar', $invert->getPluginId(), '"Invert" operation inherited from base plugin.');
|
||||
}
|
||||
|
||||
}
|
||||
158
web/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php
Normal file
158
web/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\FunctionalTests\Image;
|
||||
|
||||
use Drupal\Component\Render\FormattableMarkup;
|
||||
use Drupal\Tests\BrowserTestBase;
|
||||
use Drupal\Tests\TestFileCreationTrait;
|
||||
|
||||
/**
|
||||
* Base class for image manipulation testing.
|
||||
*/
|
||||
abstract class ToolkitTestBase extends BrowserTestBase {
|
||||
|
||||
use TestFileCreationTrait {
|
||||
getTestFiles as drupalGetTestFiles;
|
||||
}
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['image_test'];
|
||||
|
||||
/**
|
||||
* The URI for the file.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $file;
|
||||
|
||||
/**
|
||||
* The image factory service.
|
||||
*
|
||||
* @var \Drupal\Core\Image\ImageFactory
|
||||
*/
|
||||
protected $imageFactory;
|
||||
|
||||
/**
|
||||
* The image object for the test file.
|
||||
*
|
||||
* @var \Drupal\Core\Image\ImageInterface
|
||||
*/
|
||||
protected $image;
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Set the image factory service.
|
||||
$this->imageFactory = $this->container->get('image.factory');
|
||||
|
||||
// Pick a file for testing.
|
||||
$file = current($this->drupalGetTestFiles('image'));
|
||||
$this->file = $file->uri;
|
||||
|
||||
// Setup a dummy image to work with.
|
||||
$this->image = $this->getImage();
|
||||
|
||||
// Clear out any hook calls.
|
||||
$this->imageTestReset();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets up an image with the custom toolkit.
|
||||
*
|
||||
* @return \Drupal\Core\Image\ImageInterface
|
||||
* The image object.
|
||||
*/
|
||||
protected function getImage() {
|
||||
$image = $this->imageFactory->get($this->file, 'test');
|
||||
$this->assertTrue($image->isValid(), 'Image file was parsed.');
|
||||
return $image;
|
||||
}
|
||||
|
||||
/**
|
||||
* Assert that all of the specified image toolkit operations were called
|
||||
* exactly once once, other values result in failure.
|
||||
*
|
||||
* @param $expected
|
||||
* Array with string containing with the operation name, e.g. 'load',
|
||||
* 'save', 'crop', etc.
|
||||
*/
|
||||
public function assertToolkitOperationsCalled(array $expected) {
|
||||
// If one of the image operations is expected, apply should be expected as
|
||||
// well.
|
||||
$operations = [
|
||||
'resize',
|
||||
'rotate',
|
||||
'crop',
|
||||
'desaturate',
|
||||
'create_new',
|
||||
'scale',
|
||||
'scale_and_crop',
|
||||
'my_operation',
|
||||
'convert',
|
||||
];
|
||||
if (count(array_intersect($expected, $operations)) > 0 && !in_array('apply', $expected)) {
|
||||
$expected[] = 'apply';
|
||||
}
|
||||
|
||||
// Determine which operations were called.
|
||||
$actual = array_keys(array_filter($this->imageTestGetAllCalls()));
|
||||
|
||||
// Determine if there were any expected that were not called.
|
||||
$uncalled = array_diff($expected, $actual);
|
||||
if (count($uncalled)) {
|
||||
$this->assertTrue(FALSE, new FormattableMarkup('Expected operations %expected to be called but %uncalled was not called.', ['%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled)]));
|
||||
}
|
||||
else {
|
||||
$this->assertTrue(TRUE, new FormattableMarkup('All the expected operations were called: %expected', ['%expected' => implode(', ', $expected)]));
|
||||
}
|
||||
|
||||
// Determine if there were any unexpected calls.
|
||||
// If all unexpected calls are operations and apply was expected, we do not
|
||||
// count it as an error.
|
||||
$unexpected = array_diff($actual, $expected);
|
||||
if (count($unexpected) && (!in_array('apply', $expected) || count(array_intersect($unexpected, $operations)) !== count($unexpected))) {
|
||||
$this->assertTrue(FALSE, new FormattableMarkup('Unexpected operations were called: %unexpected.', ['%unexpected' => implode(', ', $unexpected)]));
|
||||
}
|
||||
else {
|
||||
$this->assertTrue(TRUE, 'No unexpected operations were called.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Resets/initializes the history of calls to the test toolkit functions.
|
||||
*/
|
||||
protected function imageTestReset() {
|
||||
// Keep track of calls to these operations
|
||||
$results = [
|
||||
'parseFile' => [],
|
||||
'save' => [],
|
||||
'settings' => [],
|
||||
'apply' => [],
|
||||
'resize' => [],
|
||||
'rotate' => [],
|
||||
'crop' => [],
|
||||
'desaturate' => [],
|
||||
'create_new' => [],
|
||||
'scale' => [],
|
||||
'scale_and_crop' => [],
|
||||
'convert' => [],
|
||||
];
|
||||
\Drupal::state()->set('image_test.results', $results);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets an array of calls to the test toolkit.
|
||||
*
|
||||
* @return array
|
||||
* An array keyed by operation name ('parseFile', 'save', 'settings',
|
||||
* 'resize', 'rotate', 'crop', 'desaturate') with values being arrays of
|
||||
* parameters passed to each call.
|
||||
*/
|
||||
protected function imageTestGetAllCalls() {
|
||||
return \Drupal::state()->get('image_test.results') ?: [];
|
||||
}
|
||||
|
||||
}
|
||||
Reference in a new issue