#990148 by chx, jhodgdon: Provide context to hook_field_attach_view_alter().

2 files changed, 12 insertions, 0 deletions

diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test
index 57c4837af..35be17d8a 100644
--- a/modules/field/tests/field.test
+++ b/modules/field/tests/field.test
@@ -1743,12 +1743,14 @@ class FieldDisplayAPITestCase extends FieldTestCase {
       'type' => 'field_test_multiple',
       'settings' => array(
         'test_formatter_setting_multiple' => $this->randomName(),
+        'alter' => TRUE,
       ),
     );
     $output = field_view_field('test_entity', $this->entity, $this->field_name, $display);
     $this->drupalSetContent(drupal_render($output));
     $setting = $display['settings']['test_formatter_setting_multiple'];
     $this->assertNoText($this->label, t('Label was not displayed.'));
+    $this->assertText('field_test_field_attach_view_alter', t('Alter fired, display passed.'));
     $array = array();
     foreach ($this->values as $delta => $value) {
       $array[] = $delta . ':' . $value['value'];
@@ -1768,6 +1770,7 @@ class FieldDisplayAPITestCase extends FieldTestCase {
     $this->drupalSetContent($view);
     $setting = $display['settings']['test_formatter_setting_additional'];
     $this->assertNoText($this->label, t('Label was not displayed.'));
+    $this->assertNoText('field_test_field_attach_view_alter', t('Alter not fired.'));
     foreach ($this->values as $delta => $value) {
       $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
     }
diff --git a/modules/field/tests/field_test.module b/modules/field/tests/field_test.module
index 693e825a9..6e068fe33 100644
--- a/modules/field/tests/field_test.module
+++ b/modules/field/tests/field_test.module
@@ -235,3 +235,12 @@ function field_test_dummy_field_storage_query(EntityFieldQuery $query) {
 function field_test_entity_label_callback($entity) {
   return 'label callback ' . $entity->ftlabel;
 }
+
+/**
+ * Implements hook_field_attach_view_alter().
+ */
+function field_test_field_attach_view_alter(&$output, $context) {
+  if (!empty($context['display']['settings']['alter'])) {
+    $output['test_field'][] = array('#markup' => 'field_test_field_attach_view_alter');
+  }
+}