summaryrefslogtreecommitdiff
path: root/modules/image/image.test
diff options
context:
space:
mode:
Diffstat (limited to 'modules/image/image.test')
-rw-r--r--modules/image/image.test11
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/image/image.test b/modules/image/image.test
index 9f0604d1d..ec00a7209 100644
--- a/modules/image/image.test
+++ b/modules/image/image.test
@@ -592,7 +592,8 @@ class ImageAdminStylesUnitTest extends ImageFieldTestCase {
// Create an image field that uses the new style.
$field_name = strtolower($this->randomName(10));
$instance = $this->createImageField($field_name, 'article');
- $instance['display']['default']['type'] = 'image__' . $style_name;
+ $instance['display']['default']['type'] = 'image';
+ $instance['display']['default']['settings']['image_style'] = $style_name;
field_update_instance($instance);
// Create a new node with an image attached.
@@ -662,21 +663,23 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
// Test the image linked to file formatter.
$instance = field_info_instance('node', $field_name, 'article');
- $instance['display']['default']['type'] = 'image_link_file';
+ $instance['display']['default']['type'] = 'image';
+ $instance['display']['default']['settings']['image_link'] = 'file';
field_update_instance($instance);
$default_output = l(theme('image', $image_info), file_create_url($image_uri), array('html' => TRUE));
$this->drupalGet('node/' . $nid);
$this->assertRaw($default_output, t('Image linked to file formatter displaying correctly on full node view.'));
// Test the image linked to content formatter.
- $instance['display']['default']['type'] = 'image_link_content';
+ $instance['display']['default']['settings']['image_link'] = 'content';
field_update_instance($instance);
$default_output = l(theme('image', $image_info), 'node/' . $nid, array('html' => TRUE, 'attributes' => array('class' => 'active')));
$this->drupalGet('node/' . $nid);
$this->assertRaw($default_output, t('Image linked to content formatter displaying correctly on full node view.'));
// Test the image style 'thumbnail' formatter.
- $instance['display']['default']['type'] = 'image__thumbnail';
+ $instance['display']['default']['settings']['image_link'] = '';
+ $instance['display']['default']['settings']['image_style'] = 'thumbnail';
field_update_instance($instance);
// Ensure the derrivative image is generated so we do not have to deal with
// image style callback paths.