From e27d0da593b5009be19cdbcb6947d2757c38ae7b Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 14 Mar 2017 09:23:44 +0000
Subject: [PATCH] Issue #2756689 by tameeshb, geertvd, arunkumark,
 claudiu.cristea, Berdir: Label of contact form message field is not hidden

---
 .../contact/src/MessageViewBuilder.php        | 19 ------------
 .../src/Functional/ContactSitewideTest.php    | 30 +++++++++++++++++++
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/core/modules/contact/src/MessageViewBuilder.php b/core/modules/contact/src/MessageViewBuilder.php
index 6cbf0e738e4b..5155341d80dd 100644
--- a/core/modules/contact/src/MessageViewBuilder.php
+++ b/core/modules/contact/src/MessageViewBuilder.php
@@ -23,25 +23,6 @@ class MessageViewBuilder extends EntityViewBuilder {
     return $build;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function buildComponents(array &$build, array $entities, array $displays, $view_mode) {
-    parent::buildComponents($build, $entities, $displays, $view_mode);
-
-    foreach ($entities as $id => $entity) {
-      // Add the message extra field, if enabled.
-      $display = $displays[$entity->bundle()];
-      if ($entity->getMessage() && $display->getComponent('message')) {
-        $build[$id]['message'] = [
-          '#type' => 'item',
-          '#title' => t('Message'),
-          '#plain_text' => $entity->getMessage(),
-        ];
-      }
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/contact/tests/src/Functional/ContactSitewideTest.php b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
index 43ad728b869b..5b974053673b 100644
--- a/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
@@ -50,6 +50,7 @@ class ContactSitewideTest extends BrowserTestBase {
       'administer contact forms',
       'administer users',
       'administer account settings',
+      'administer contact_message display',
       'administer contact_message fields',
       'administer contact_message form display',
     ]);
@@ -343,6 +344,35 @@ class ContactSitewideTest extends BrowserTestBase {
     $result = $this->xpath('//div[@role=:role]', [':role' => 'contentinfo']);
     $this->assertEqual(count($result), 0, 'Messages not found.');
     $this->assertUrl('user/' . $admin_user->id());
+
+    // Test preview and visibility of the message field and label. Submit the
+    // contact form and verify the content.
+    $edit = [
+      'subject[0][value]' => $this->randomMachineName(),
+      'message[0][value]' => $this->randomMachineName(),
+      $field_name . '[0][value]' => $this->randomMachineName(),
+    ];
+    $this->drupalPostForm($form->toUrl('canonical'), $edit, t('Preview'));
+
+    // Message is now by default displayed twice, once for the form element and
+    // once for the viewed message.
+    $page_text = $this->getSession()->getPage()->getText();
+    $this->assertGreaterThan(1, substr_count($page_text, t('Message')));
+    $this->assertSession()->responseContains('class="field field--name-message field--type-string-long field--label-above');
+    $this->assertSession()->pageTextContains($edit['message[0][value]']);
+
+    // Hide the message field label.
+    $display_edit = [
+      'fields[message][label]' => 'hidden',
+    ];
+    $this->drupalPostForm('admin/structure/contact/manage/' . $contact_form . '/display', $display_edit, t('Save'));
+
+    $this->drupalPostForm($form->toUrl('canonical'), $edit, t('Preview'));
+    // Message should only be displayed once now.
+    $page_text = $this->getSession()->getPage()->getText();
+    $this->assertEquals(1, substr_count($page_text, t('Message')));
+    $this->assertSession()->responseContains('class="field field--name-message field--type-string-long field--label-hidden field__item">');
+    $this->assertSession()->pageTextContains($edit['message[0][value]']);
   }
 
   /**