opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.0. For more information, see https://www.drupal.org/project/drupal/releases/8.2.0

Browse source
This commit is contained in:
Pantheon Automation 2016-10-06 15:16:20 -07:00 • committed by Greg Anderson
parent 2f563ab520
commit f1c8716f57
1732 changed files with 52334 additions and 11780 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/modules/image/src/Tests/ImageEffectsTest.php
View file

@ -2,6 +2,7 @@
namespace Drupal\image\Tests;
use Drupal\image\Entity\ImageStyle;
use Drupal\system\Tests\Image\ToolkitTestBase;
/**
@ -162,6 +163,26 @@ class ImageEffectsTest extends ToolkitTestBase {
$this->assertTrue($effects == $cached_effects, 'Cached effects are the same as generated effects.');
}
/**
* Tests if validation errors are passed plugin form to the parent form.
*/
public function testEffectFormValidationErrors() {
$account = $this->drupalCreateUser(['administer image styles']);
$this->drupalLogin($account);
/** @var \Drupal\image\ImageStyleInterface $style */
$style = ImageStyle::load('thumbnail');
// Image Scale is the only effect shipped with 'thumbnail', by default.
$uuids = $style->getEffects()->getInstanceIds();
$uuid = key($uuids);
// We are posting the form with both, width and height, empty.
$edit = ['data[width]' => '', 'data[height]' => ''];
$path = 'admin/config/media/image-styles/manage/thumbnail/effects/' . $uuid;
$this->drupalPostForm($path, $edit, t('Update effect'));
// Check that the error message has been displayed.
$this->assertText(t('Width and height can not both be blank.'));
}
/**
* Asserts the effect processing of an image effect plugin.
*

61
core/modules/image/src/Tests/ImageFieldTestBase.php
View file

@ -2,9 +2,8 @@
namespace Drupal\image\Tests;
use Drupal\field\Entity\FieldConfig;
use Drupal\Tests\image\Kernel\ImageFieldCreationTrait;
use Drupal\simpletest\WebTestBase;
use Drupal\field\Entity\FieldStorageConfig;
/**
* TODO: Test the following functions.
@ -24,6 +23,8 @@ use Drupal\field\Entity\FieldStorageConfig;
*/
abstract class ImageFieldTestBase extends WebTestBase {
use ImageFieldCreationTrait;
/**
* Modules to enable.
*
@ -51,62 +52,6 @@ abstract class ImageFieldTestBase extends WebTestBase {
$this->drupalLogin($this->adminUser);
}
/**
* Create a new image field.
*
* @param string $name
* The name of the new field (all lowercase), exclude the "field_" prefix.
* @param string $type_name
* The node type that this field will be added to.
* @param array $storage_settings
* A list of field storage settings that will be added to the defaults.
* @param array $field_settings
* A list of instance settings that will be added to the instance defaults.
* @param array $widget_settings
* Widget settings to be added to the widget defaults.
* @param array $formatter_settings
* Formatter settings to be added to the formatter defaults.
* @param string $description
* A description for the field.
*/
function createImageField($name, $type_name, $storage_settings = array(), $field_settings = array(), $widget_settings = array(), $formatter_settings = array(), $description = '') {
FieldStorageConfig::create(array(
'field_name' => $name,
'entity_type' => 'node',
'type' => 'image',
'settings' => $storage_settings,
'cardinality' => !empty($storage_settings['cardinality']) ? $storage_settings['cardinality'] : 1,
))->save();
$field_config = FieldConfig::create([
'field_name' => $name,
'label' => $name,
'entity_type' => 'node',
'bundle' => $type_name,
'required' => !empty($field_settings['required']),
'settings' => $field_settings,
'description' => $description,
]);
$field_config->save();
entity_get_form_display('node', $type_name, 'default')
->setComponent($name, array(
'type' => 'image_image',
'settings' => $widget_settings,
))
->save();
entity_get_display('node', $type_name, 'default')
->setComponent($name, array(
'type' => 'image',
'settings' => $formatter_settings,
))
->save();
return $field_config;
}
/**
* Preview an image in a node.
*

84
core/modules/image/src/Tests/ImageFieldValidateTest.php
View file

@ -12,15 +12,43 @@ class ImageFieldValidateTest extends ImageFieldTestBase {
* Test min/max resolution settings.
*/
function testResolution() {
$field_name = strtolower($this->randomMachineName());
$min_resolution = 50;
$max_resolution = 100;
$field_settings = array(
'max_resolution' => $max_resolution . 'x' . $max_resolution,
'min_resolution' => $min_resolution . 'x' . $min_resolution,
'alt_field' => 0,
);
$this->createImageField($field_name, 'article', array(), $field_settings);
$field_names = [
0 => strtolower($this->randomMachineName()),
1 => strtolower($this->randomMachineName()),
2 => strtolower($this->randomMachineName()),
];
$min_resolution = [
'width' => 50,
'height' => 50
];
$max_resolution = [
'width' => 100,
'height' => 100
];
$no_height_min_resolution = [
'width' => 50,
'height' => NULL
];
$no_height_max_resolution = [
'width' => 100,
'height' => NULL
];
$no_width_min_resolution = [
'width' => NULL,
'height' => 50
];
$no_width_max_resolution = [
'width' => NULL,
'height' => 100
];
$field_settings = [
0 => $this->getFieldSettings($min_resolution, $max_resolution),
1 => $this->getFieldSettings($no_height_min_resolution, $no_height_max_resolution),
2 => $this->getFieldSettings($no_width_min_resolution, $no_width_max_resolution),
];
$this->createImageField($field_names[0], 'article', [], $field_settings[0]);
$this->createImageField($field_names[1], 'article', [], $field_settings[1]);
$this->createImageField($field_names[2], 'article', [], $field_settings[2]);
// We want a test image that is too small, and a test image that is too
// big, so cycle through test image files until we have what we need.
@ -29,21 +57,29 @@ class ImageFieldValidateTest extends ImageFieldTestBase {
$image_factory = $this->container->get('image.factory');
foreach ($this->drupalGetTestFiles('image') as $image) {
$image_file = $image_factory->get($image->uri);
if ($image_file->getWidth() > $max_resolution) {
if ($image_file->getWidth() > $max_resolution['width']) {
$image_that_is_too_big = $image;
}
if ($image_file->getWidth() < $min_resolution) {
if ($image_file->getWidth() < $min_resolution['width']) {
$image_that_is_too_small = $image;
}
if ($image_that_is_too_small && $image_that_is_too_big) {
break;
}
}
$this->uploadNodeImage($image_that_is_too_small, $field_name, 'article');
$this->assertRaw(t('The specified file %name could not be uploaded.', array('%name' => $image_that_is_too_small->filename)));
$this->assertRaw(t('The image is too small; the minimum dimensions are %dimensions pixels.', array('%dimensions' => '50x50')));
$this->uploadNodeImage($image_that_is_too_big, $field_name, 'article');
$this->uploadNodeImage($image_that_is_too_small, $field_names[0], 'article');
$this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
$this->assertRaw(t('The image is too small; the minimum dimensions are %dimensions pixels.', ['%dimensions' => '50x50']));
$this->uploadNodeImage($image_that_is_too_big, $field_names[0], 'article');
$this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'));
$this->uploadNodeImage($image_that_is_too_small, $field_names[1], 'article');
$this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
$this->uploadNodeImage($image_that_is_too_big, $field_names[1], 'article');
$this->assertText(t('The image was resized to fit within the maximum allowed width of 100 pixels.'));
$this->uploadNodeImage($image_that_is_too_small, $field_names[2], 'article');
$this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
$this->uploadNodeImage($image_that_is_too_big, $field_names[2], 'article');
$this->assertText(t('The image was resized to fit within the maximum allowed height of 100 pixels.'));
}
/**
@ -102,4 +138,22 @@ class ImageFieldValidateTest extends ImageFieldTestBase {
$this->assertNoText(t('Title field is required.'));
}
/**
* Returns field settings.
*
* @param int[] $min_resolution
* The minimum width and height resolution setting.
* @param int[] $max_resolution
* The maximum width and height resolution setting.
*
* @return array
*/
protected function getFieldSettings($min_resolution, $max_resolution) {
return [
'max_resolution' => $max_resolution['width'] . 'x' . $max_resolution['height'],
'min_resolution' => $min_resolution['width'] . 'x' . $min_resolution['height'],
'alt_field' => 0,
];
}
}

2
core/modules/image/src/Tests/ImageFieldWidgetTest.php
View file

@ -13,7 +13,7 @@ class ImageFieldWidgetTest extends ImageFieldTestBase {
* Tests file widget element.
*/
public function testWidgetElement() {
// Check for image widget in add/node/article page
// Check for image widget in add/node/article page
$field_name = strtolower($this->randomMachineName());
$min_resolution = 50;
$max_resolution = 100;

8
core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
View file

@ -30,7 +30,9 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
parent::setUp();
// Create the "Basic page" node type.
$this->drupalCreateContentType(array('type' => 'basicpage', 'name' => 'Basic page'));
// @todo Remove the disabling of new revision creation in
// https://www.drupal.org/node/1239558.
$this->drupalCreateContentType(['type' => 'basicpage', 'name' => 'Basic page', 'new_revision' => FALSE]);
// Create a image field on the "Basic page" node type.
$this->fieldName = strtolower($this->randomMachineName());
@ -191,10 +193,6 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
$file = File::load($replaced_second_fid);
$this->assertTrue($file->isPermanent());
// Ensure the file status of the old second file is now temporary.
$file = File::load($second_fid);
$this->assertTrue($file->isTemporary());
// Delete the third translation.
$this->drupalPostForm('nl/node/' . $default_language_node->id() . '/delete', array(), t('Delete Dutch translation'));

6
core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
View file

@ -62,9 +62,9 @@ class ImageStylesPathAndUrlTest extends WebTestBase {
/**
* Tests an image style URL with the "public://" scheme and unclean URLs.
*/
function testImageStyleUrlAndPathPublicUnclean() {
$this->doImageStyleUrlAndPathTests('public', FALSE);
}
function testImageStyleUrlAndPathPublicUnclean() {
$this->doImageStyleUrlAndPathTests('public', FALSE);
}
/**
* Tests an image style URL with the "private://" schema and unclean URLs.