updated core and modules

core/modules/contact/tests/drupal-7.contact.database.php

@@ -11,23 +11,23 @@
 
 // Update the default category to that it is not selected.
 db_update('contact')
-  ->fields(array('selected' => '0'))
+  ->fields(['selected' => '0'])
   ->condition('cid', '1')
   ->execute();
 
 // Add a custom contact category.
-db_insert('contact')->fields(array(
+db_insert('contact')->fields([
   'category',
   'recipients',
   'reply',
   'weight',
   'selected'
-))
-->values(array(
+])
+  ->values([
   'category' => 'Upgrade test',
   'recipients' => 'test1@example.com,test2@example.com',
   'reply' => 'Test reply',
   'weight' => 1,
   'selected' => 1,
-))
-->execute();
+])
+  ->execute();

core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.info.yml

@@ -8,8 +8,8 @@ dependencies:
   - contact
   - user
 
-# Information added by Drupal.org packaging script on 2016-08-03
-version: '8.1.8'
+# Information added by Drupal.org packaging script on 2017-08-16
+version: '8.3.7'
 core: '8.x'
 project: 'drupal'
-datestamp: 1470233790
+datestamp: 1502903957

core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module

@@ -15,7 +15,7 @@ use Drupal\Core\Form\FormStateInterface;
  */
 function contact_storage_test_entity_base_field_info(EntityTypeInterface $entity_type) {
   if ($entity_type->id() == 'contact_message') {
-    $fields = array();
+    $fields = [];
 
     $fields['id'] = BaseFieldDefinition::create('integer')
       ->setLabel(t('Message ID'))
@@ -48,12 +48,12 @@ function contact_storage_test_entity_type_alter(array &$entity_types) {
 function contact_storage_test_form_contact_form_form_alter(&$form, FormStateInterface $form_state) {
   /** @var \Drupal\contact\ContactFormInterface $contact_form */
   $contact_form = $form_state->getFormObject()->getEntity();
-  $form['send_a_pony'] = array(
+  $form['send_a_pony'] = [
     '#type' => 'checkbox',
     '#title' => t('Send submitters a voucher for a free pony.'),
     '#description' => t('Enable to send an additional email with a free pony voucher to anyone who submits the form.'),
     '#default_value' => $contact_form->getThirdPartySetting('contact_storage_test', 'send_a_pony', FALSE),
-  );
+  ];
   $form['#entity_builders'][] = 'contact_storage_test_contact_form_form_builder';
 }
 /**

core/modules/contact/tests/modules/contact_test/config/install/contact.form.feedback.yml

@@ -5,3 +5,5 @@ reply: ''
 weight: 0
 status: true
 langcode: en
+message: 'Your message has been sent.'
+redirect: ''

core/modules/contact/tests/modules/contact_test/contact_test.info.yml

@@ -7,8 +7,8 @@ package: Testing
 dependencies:
   - contact
 
-# Information added by Drupal.org packaging script on 2016-08-03
-version: '8.1.8'
+# Information added by Drupal.org packaging script on 2017-08-16
+version: '8.3.7'
 core: '8.x'
 project: 'drupal'
-datestamp: 1470233790
+datestamp: 1502903957

core/modules/contact/tests/modules/contact_test_views/contact_test_views.info.yml

@@ -9,8 +9,8 @@ dependencies:
   - views
   - user
 
-# Information added by Drupal.org packaging script on 2016-08-03
-version: '8.1.8'
+# Information added by Drupal.org packaging script on 2017-08-16
+version: '8.3.7'
 core: '8.x'
 project: 'drupal'
-datestamp: 1470233790
+datestamp: 1502903957

core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml

@@ -111,7 +111,7 @@ display:
           entity_type: user
       filters:
         status:
-          value: true
+          value: '1'
           table: users_field_data
           field: status
           id: status

core/modules/contact/tests/src/Functional/ContactAuthenticatedUserTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\contact\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests contact form textfields are present if authenticated.
+ *
+ * @group contact
+ */
+class ContactAuthenticatedUserTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['contact'];
+
+  /**
+   * Tests that name and email fields are not present for authenticated users.
+   */
+  public function testContactSiteWideTextfieldsLoggedInTestCase() {
+    $this->drupalLogin($this->drupalCreateUser(['access site-wide contact form']));
+    $this->drupalGet('contact');
+
+    // Ensure that there is no textfield for name.
+    $this->assertFalse($this->xpath('//input[@name=:name]', [':name' => 'name']));
+
+    // Ensure that there is no textfield for email.
+    $this->assertFalse($this->xpath('//input[@name=:name]', [':name' => 'mail']));
+  }
+
+}

core/modules/contact/tests/src/Functional/ContactLanguageTest.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\Tests\contact\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests contact messages with language module.
+ *
+ * This is to ensure that a contact form by default does not show the language
+ * select, but it does so when it's enabled from the content language settings
+ * page.
+ *
+ * @group contact
+ */
+class ContactLanguageTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'contact',
+    'language',
+    'contact_test',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create and log in administrative user.
+    $admin_user = $this->drupalCreateUser([
+      'access site-wide contact form',
+      'administer languages',
+    ]);
+    $this->drupalLogin($admin_user);
+  }
+
+  /**
+   * Tests configuration options with language enabled.
+   */
+  public function testContactLanguage() {
+    // Ensure that contact form by default does not show the language select.
+    $this->drupalGet('contact');
+    $this->assertResponse(200, 'The page exists');
+    $this->assertNoField('edit-langcode-0-value');
+
+    // Enable language select from content language settings page.
+    $settings_path = 'admin/config/regional/content-language';
+    $edit['entity_types[contact_message]'] = TRUE;
+    $edit['settings[contact_message][feedback][settings][language][language_alterable]'] = TRUE;
+    $this->drupalPostForm($settings_path, $edit, t('Save configuration'));
+
+    // Ensure that contact form now shows the language select.
+    $this->drupalGet('contact');
+    $this->assertResponse(200, 'The page exists');
+    $this->assertField('edit-langcode-0-value');
+  }
+
+}

core/modules/contact/tests/src/Functional/ContactPersonalTest.php

@@ -0,0 +1,323 @@
+<?php
+
+namespace Drupal\Tests\contact\Functional;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\PlainTextOutput;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Test\AssertMailTrait;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\user\RoleInterface;
+
+/**
+ * Tests personal contact form functionality.
+ *
+ * @group contact
+ */
+class ContactPersonalTest extends BrowserTestBase {
+
+  use AssertMailTrait;
+  use AssertPageCacheContextsAndTagsTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['contact', 'dblog'];
+
+  /**
+   * A user with some administrative permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  private $adminUser;
+
+  /**
+   * A user with permission to view profiles and access user contact forms.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  private $webUser;
+
+  /**
+   * A user without any permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  private $contactUser;
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create an admin user.
+    $this->adminUser = $this->drupalCreateUser(['administer contact forms', 'administer users', 'administer account settings', 'access site reports']);
+
+    // Create some normal users with their contact forms enabled by default.
+    $this->config('contact.settings')->set('user_default_enabled', TRUE)->save();
+    $this->webUser = $this->drupalCreateUser(['access user profiles', 'access user contact forms']);
+    $this->contactUser = $this->drupalCreateUser();
+  }
+
+  /**
+   * Tests that mails for contact messages are correctly sent.
+   */
+  public function testSendPersonalContactMessage() {
+    // Ensure that the web user's email needs escaping.
+    $mail = $this->webUser->getUsername() . '&escaped@example.com';
+    $this->webUser->setEmail($mail)->save();
+    $this->drupalLogin($this->webUser);
+
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertEscaped($mail);
+    $message = $this->submitPersonalContact($this->contactUser);
+    $mails = $this->getMails();
+    $this->assertEqual(1, count($mails));
+    $mail = $mails[0];
+    $this->assertEqual($mail['to'], $this->contactUser->getEmail());
+    $this->assertEqual($mail['from'], $this->config('system.site')->get('mail'));
+    $this->assertEqual($mail['reply-to'], $this->webUser->getEmail());
+    $this->assertEqual($mail['key'], 'user_mail');
+    $variables = [
+      '@site-name' => $this->config('system.site')->get('name'),
+      '@subject' => $message['subject[0][value]'],
+      '@recipient-name' => $this->contactUser->getDisplayName(),
+    ];
+    $subject = PlainTextOutput::renderFromHtml(t('[@site-name] @subject', $variables));
+    $this->assertEqual($mail['subject'], $subject, 'Subject is in sent message.');
+    $this->assertTrue(strpos($mail['body'], 'Hello ' . $variables['@recipient-name']) !== FALSE, 'Recipient name is in sent message.');
+    $this->assertTrue(strpos($mail['body'], $this->webUser->getDisplayName()) !== FALSE, 'Sender name is in sent message.');
+    $this->assertTrue(strpos($mail['body'], $message['message[0][value]']) !== FALSE, 'Message body is in sent message.');
+
+    // Check there was no problems raised during sending.
+    $this->drupalLogout();
+    $this->drupalLogin($this->adminUser);
+    // Verify that the correct watchdog message has been logged.
+    $this->drupalGet('/admin/reports/dblog');
+    $placeholders = [
+      '@sender_name' => $this->webUser->username,
+      '@sender_email' => $this->webUser->getEmail(),
+      '@recipient_name' => $this->contactUser->getUsername()
+    ];
+    $this->assertRaw(SafeMarkup::format('@sender_name (@sender_email) sent @recipient_name an email.', $placeholders));
+    // Ensure an unescaped version of the email does not exist anywhere.
+    $this->assertNoRaw($this->webUser->getEmail());
+  }
+
+  /**
+   * Tests access to the personal contact form.
+   */
+  public function testPersonalContactAccess() {
+    // Test allowed access to admin user's contact form.
+    $this->drupalLogin($this->webUser);
+    $this->drupalGet('user/' . $this->adminUser->id() . '/contact');
+    $this->assertResponse(200);
+    // Check the page title is properly displayed.
+    $this->assertRaw(t('Contact @username', ['@username' => $this->adminUser->getDisplayName()]));
+
+    // Test denied access to admin user's own contact form.
+    $this->drupalLogout();
+    $this->drupalLogin($this->adminUser);
+    $this->drupalGet('user/' . $this->adminUser->id() . '/contact');
+    $this->assertResponse(403);
+
+    // Test allowed access to user with contact form enabled.
+    $this->drupalLogin($this->webUser);
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertResponse(200);
+
+    // Test that there is no access to personal contact forms for users
+    // without an email address configured.
+    $original_email = $this->contactUser->getEmail();
+    $this->contactUser->setEmail(FALSE)->save();
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertResponse(404, 'Not found (404) returned when visiting a personal contact form for a user with no email address');
+
+    // Test that the 'contact tab' does not appear on the user profiles
+    // for users without an email address configured.
+    $this->drupalGet('user/' . $this->contactUser->id());
+    $contact_link = '/user/' . $this->contactUser->id() . '/contact';
+    $this->assertResponse(200);
+    $this->assertNoLinkByHref ($contact_link, 'The "contact" tab is hidden on profiles for users with no email address');
+
+    // Restore original email address.
+    $this->contactUser->setEmail($original_email)->save();
+
+    // Test denied access to the user's own contact form.
+    $this->drupalGet('user/' . $this->webUser->id() . '/contact');
+    $this->assertResponse(403);
+
+    // Test always denied access to the anonymous user contact form.
+    $this->drupalGet('user/0/contact');
+    $this->assertResponse(403);
+
+    // Test that anonymous users can access the contact form.
+    $this->drupalLogout();
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access user contact forms']);
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertResponse(200);
+
+    // Test that anonymous users can access admin user's contact form.
+    $this->drupalGet('user/' . $this->adminUser->id() . '/contact');
+    $this->assertResponse(200);
+    $this->assertCacheContext('user');
+
+    // Revoke the personal contact permission for the anonymous user.
+    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access user contact forms']);
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertResponse(403);
+    $this->assertCacheContext('user');
+    $this->drupalGet('user/' . $this->adminUser->id() . '/contact');
+    $this->assertResponse(403);
+
+    // Disable the personal contact form.
+    $this->drupalLogin($this->adminUser);
+    $edit = ['contact_default_status' => FALSE];
+    $this->drupalPostForm('admin/config/people/accounts', $edit, t('Save configuration'));
+    $this->assertText(t('The configuration options have been saved.'), 'Setting successfully saved.');
+    $this->drupalLogout();
+
+    // Re-create our contacted user with personal contact forms disabled by
+    // default.
+    $this->contactUser = $this->drupalCreateUser();
+
+    // Test denied access to a user with contact form disabled.
+    $this->drupalLogin($this->webUser);
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertResponse(403);
+
+    // Test allowed access for admin user to a user with contact form disabled.
+    $this->drupalLogin($this->adminUser);
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertResponse(200);
+
+    // Re-create our contacted user as a blocked user.
+    $this->contactUser = $this->drupalCreateUser();
+    $this->contactUser->block();
+    $this->contactUser->save();
+
+    // Test that blocked users can still be contacted by admin.
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertResponse(200);
+
+    // Test that blocked users cannot be contacted by non-admins.
+    $this->drupalLogin($this->webUser);
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertResponse(403);
+
+    // Test enabling and disabling the contact page through the user profile
+    // form.
+    $this->drupalGet('user/' . $this->webUser->id() . '/edit');
+    $this->assertNoFieldChecked('edit-contact--2');
+    $this->assertFalse(\Drupal::service('user.data')->get('contact', $this->webUser->id(), 'enabled'), 'Personal contact form disabled');
+    $this->drupalPostForm(NULL, ['contact' => TRUE], t('Save'));
+    $this->assertFieldChecked('edit-contact--2');
+    $this->assertTrue(\Drupal::service('user.data')->get('contact', $this->webUser->id(), 'enabled'), 'Personal contact form enabled');
+
+    // Test with disabled global default contact form in combination with a user
+    // that has the contact form enabled.
+    $this->config('contact.settings')->set('user_default_enabled', FALSE)->save();
+    $this->contactUser = $this->drupalCreateUser();
+    \Drupal::service('user.data')->set('contact', $this->contactUser->id(), 'enabled', 1);
+
+    $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
+    $this->assertResponse(200);
+  }
+
+  /**
+   * Tests the personal contact form flood protection.
+   */
+  public function testPersonalContactFlood() {
+    $flood_limit = 3;
+    $this->config('contact.settings')->set('flood.limit', $flood_limit)->save();
+
+    $this->drupalLogin($this->webUser);
+
+    // Submit contact form with correct values and check flood interval.
+    for ($i = 0; $i < $flood_limit; $i++) {
+      $this->submitPersonalContact($this->contactUser);
+      $this->assertText(t('Your message has been sent.'), 'Message sent.');
+    }
+
+    // Submit contact form one over limit.
+    $this->submitPersonalContact($this->contactUser);
+    $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', ['%number' => $flood_limit, '@interval' => \Drupal::service('date.formatter')->formatInterval($this->config('contact.settings')->get('flood.interval'))]), 'Normal user denied access to flooded contact form.');
+
+    // Test that the admin user can still access the contact form even though
+    // the flood limit was reached.
+    $this->drupalLogin($this->adminUser);
+    $this->assertNoText('Try again later.', 'Admin user not denied access to flooded contact form.');
+  }
+
+  /**
+   * Tests the personal contact form based access when an admin adds users.
+   */
+  public function testAdminContact() {
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access user contact forms']);
+    $this->checkContactAccess(200);
+    $this->checkContactAccess(403, FALSE);
+    $config = $this->config('contact.settings');
+    $config->set('user_default_enabled', FALSE);
+    $config->save();
+    $this->checkContactAccess(403);
+  }
+
+  /**
+   * Creates a user and then checks contact form access.
+   *
+   * @param int $response
+   *   The expected response code.
+   * @param bool $contact_value
+   *   (optional) The value the contact field should be set too.
+   */
+  protected function checkContactAccess($response, $contact_value = NULL) {
+    $this->drupalLogin($this->adminUser);
+    $this->drupalGet('admin/people/create');
+    if ($this->config('contact.settings')->get('user_default_enabled', TRUE)) {
+      $this->assertFieldChecked('edit-contact--2');
+    }
+    else {
+      $this->assertNoFieldChecked('edit-contact--2');
+    }
+    $name = $this->randomMachineName();
+    $edit = [
+      'name' => $name,
+      'mail' => $this->randomMachineName() . '@example.com',
+      'pass[pass1]' => $pass = $this->randomString(),
+      'pass[pass2]' => $pass,
+      'notify' => FALSE,
+    ];
+    if (isset($contact_value)) {
+      $edit['contact'] = $contact_value;
+    }
+    $this->drupalPostForm('admin/people/create', $edit, t('Create new account'));
+    $user = user_load_by_name($name);
+    $this->drupalLogout();
+
+    $this->drupalGet('user/' . $user->id() . '/contact');
+    $this->assertResponse($response);
+  }
+
+  /**
+   * Fills out a user's personal contact form and submits it.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   A user object of the user being contacted.
+   * @param array $message
+   *   (optional) An array with the form fields being used. Defaults to an empty
+   *   array.
+   *
+   * @return array
+   *   An array with the form fields being used.
+   */
+  protected function submitPersonalContact(AccountInterface $account, array $message = []) {
+    $message += [
+      'subject[0][value]' => $this->randomMachineName(16),
+      'message[0][value]' => $this->randomMachineName(64),
+    ];
+    $this->drupalPostForm('user/' . $account->id() . '/contact', $message, t('Send message'));
+    return $message;
+  }
+
+}

core/modules/contact/tests/src/Functional/ContactSitewideTest.php

@@ -0,0 +1,553 @@
+<?php
+
+namespace Drupal\Tests\contact\Functional;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\contact\Entity\ContactForm;
+use Drupal\Core\Mail\MailFormatHelper;
+use Drupal\Core\Test\AssertMailTrait;
+use Drupal\field_ui\Tests\FieldUiTestTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\user\RoleInterface;
+
+/**
+ * Tests site-wide contact form functionality.
+ *
+ * @see \Drupal\Tests\contact\Functional\ContactStorageTest
+ *
+ * @group contact
+ */
+class ContactSitewideTest extends BrowserTestBase {
+
+  use FieldUiTestTrait;
+  use AssertMailTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['text', 'contact', 'field_ui', 'contact_test', 'block', 'error_service_test', 'dblog'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->drupalPlaceBlock('system_breadcrumb_block');
+    $this->drupalPlaceBlock('local_actions_block');
+    $this->drupalPlaceBlock('page_title_block');
+  }
+
+  /**
+   * Tests configuration options and the site-wide contact form.
+   */
+  public function testSiteWideContact() {
+    // Create and log in administrative user.
+    $admin_user = $this->drupalCreateUser([
+      'access site-wide contact form',
+      'administer contact forms',
+      'administer users',
+      'administer account settings',
+      'administer contact_message display',
+      'administer contact_message fields',
+      'administer contact_message form display',
+    ]);
+    $this->drupalLogin($admin_user);
+
+    // Check the presence of expected cache tags.
+    $this->drupalGet('contact');
+    $this->assertCacheTag('config:contact.settings');
+
+    $flood_limit = 3;
+    $this->config('contact.settings')
+      ->set('flood.limit', $flood_limit)
+      ->set('flood.interval', 600)
+      ->save();
+
+    // Set settings.
+    $edit = [];
+    $edit['contact_default_status'] = TRUE;
+    $this->drupalPostForm('admin/config/people/accounts', $edit, t('Save configuration'));
+    $this->assertText(t('The configuration options have been saved.'));
+
+    $this->drupalGet('admin/structure/contact');
+    // Default form exists.
+    $this->assertLinkByHref('admin/structure/contact/manage/feedback/delete');
+    // User form could not be changed or deleted.
+    // Cannot use ::assertNoLinkByHref as it does partial url matching and with
+    // field_ui enabled admin/structure/contact/manage/personal/fields exists.
+    // @todo: See https://www.drupal.org/node/2031223 for the above.
+    $edit_link = $this->xpath('//a[@href=:href]', [
+      ':href' => \Drupal::url('entity.contact_form.edit_form', ['contact_form' => 'personal'])
+    ]);
+    $this->assertTrue(empty($edit_link), format_string('No link containing href %href found.',
+      ['%href' => 'admin/structure/contact/manage/personal']
+    ));
+    $this->assertNoLinkByHref('admin/structure/contact/manage/personal/delete');
+
+    $this->drupalGet('admin/structure/contact/manage/personal');
+    $this->assertResponse(403);
+
+    // Delete old forms to ensure that new forms are used.
+    $this->deleteContactForms();
+    $this->drupalGet('admin/structure/contact');
+    $this->assertText('Personal', 'Personal form was not deleted');
+    $this->assertNoLinkByHref('admin/structure/contact/manage/feedback');
+
+    // Ensure that the contact form won't be shown without forms.
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
+    $this->drupalLogout();
+    $this->drupalGet('contact');
+    $this->assertResponse(404);
+
+    $this->drupalLogin($admin_user);
+    $this->drupalGet('contact');
+    $this->assertResponse(200);
+    $this->assertText(t('The contact form has not been configured.'));
+    // Test access personal form via site-wide contact page.
+    $this->drupalGet('contact/personal');
+    $this->assertResponse(403);
+
+    // Add forms.
+    // Test invalid recipients.
+    $invalid_recipients = ['invalid', 'invalid@', 'invalid@site.', '@site.', '@site.com'];
+    foreach ($invalid_recipients as $invalid_recipient) {
+      $this->addContactForm($this->randomMachineName(16), $this->randomMachineName(16), $invalid_recipient, '', FALSE);
+      $this->assertRaw(t('%recipient is an invalid email address.', ['%recipient' => $invalid_recipient]));
+    }
+
+    // Test validation of empty form and recipients fields.
+    $this->addContactForm('', '', '', '', TRUE);
+    $this->assertText(t('Label field is required.'));
+    $this->assertText(t('Machine-readable name field is required.'));
+    $this->assertText(t('Recipients field is required.'));
+
+    // Test validation of max_length machine name.
+    $recipients = ['simpletest&@example.com', 'simpletest2@example.com', 'simpletest3@example.com'];
+    $max_length = EntityTypeInterface::BUNDLE_MAX_LENGTH;
+    $max_length_exceeded = $max_length + 1;
+    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName($max_length_exceeded)), $label = $this->randomMachineName($max_length_exceeded), implode(',', [$recipients[0]]), '', TRUE);
+    $this->assertText(format_string('Machine-readable name cannot be longer than @max characters but is currently @exceeded characters long.', ['@max' => $max_length, '@exceeded' => $max_length_exceeded]));
+    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName($max_length)), $label = $this->randomMachineName($max_length), implode(',', [$recipients[0]]), '', TRUE);
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
+
+    // Verify that the creation message contains a link to a contact form.
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'contact/']);
+    $this->assert(isset($view_link), 'The message area contains a link to a contact form.');
+
+    // Create first valid form.
+    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', [$recipients[0]]), '', TRUE);
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
+
+    // Verify that the creation message contains a link to a contact form.
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'contact/']);
+    $this->assert(isset($view_link), 'The message area contains a link to a contact form.');
+
+    // Check that the form was created in site default language.
+    $langcode = $this->config('contact.form.' . $id)->get('langcode');
+    $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
+    $this->assertEqual($langcode, $default_langcode);
+
+    // Make sure the newly created form is included in the list of forms.
+    $this->assertNoUniqueText($label, 'New form included in forms list.');
+
+    // Ensure that the recipient email is escaped on the listing.
+    $this->drupalGet('admin/structure/contact');
+    $this->assertEscaped($recipients[0]);
+
+    // Test update contact form.
+    $this->updateContactForm($id, $label = $this->randomMachineName(16), $recipients_str = implode(',', [$recipients[0], $recipients[1]]), $reply = $this->randomMachineName(30), FALSE, 'Your message has been sent.', '/user');
+    $config = $this->config('contact.form.' . $id)->get();
+    $this->assertEqual($config['label'], $label);
+    $this->assertEqual($config['recipients'], [$recipients[0], $recipients[1]]);
+    $this->assertEqual($config['reply'], $reply);
+    $this->assertNotEqual($id, $this->config('contact.settings')->get('default_form'));
+    $this->assertText(t('Contact form @label has been updated.', ['@label' => $label]));
+    // Ensure the label is displayed on the contact page for this form.
+    $this->drupalGet('contact/' . $id);
+    $this->assertText($label);
+
+    // Reset the form back to be the default form.
+    $this->config('contact.settings')->set('default_form', $id)->save();
+
+    // Ensure that the contact form is shown without a form selection input.
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
+    $this->drupalLogout();
+    $this->drupalGet('contact');
+    $this->assertText(t('Your email address'));
+    $this->assertNoText(t('Form'));
+    $this->drupalLogin($admin_user);
+
+    // Add more forms.
+    $this->addContactForm(Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', [$recipients[0], $recipients[1]]), '', FALSE);
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
+
+    $this->addContactForm($name = Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', [$recipients[0], $recipients[1], $recipients[2]]), '', FALSE);
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
+
+    // Try adding a form that already exists.
+    $this->addContactForm($name, $label, '', '', FALSE);
+    $this->assertNoText(t('Contact form @label has been added.', ['@label' => $label]));
+    $this->assertRaw(t('The machine-readable name is already in use. It must be unique.'));
+
+    $this->drupalLogout();
+
+    // Check to see that anonymous user cannot see contact page without permission.
+    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
+    $this->drupalGet('contact');
+    $this->assertResponse(403);
+
+    // Give anonymous user permission and see that page is viewable.
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
+    $this->drupalGet('contact');
+    $this->assertResponse(200);
+
+    // Submit contact form with invalid values.
+    $this->submitContact('', $recipients[0], $this->randomMachineName(16), $id, $this->randomMachineName(64));
+    $this->assertText(t('Your name field is required.'));
+
+    $this->submitContact($this->randomMachineName(16), '', $this->randomMachineName(16), $id, $this->randomMachineName(64));
+    $this->assertText(t('Your email address field is required.'));
+
+    $this->submitContact($this->randomMachineName(16), $invalid_recipients[0], $this->randomMachineName(16), $id, $this->randomMachineName(64));
+    $this->assertRaw(t('The email address %mail is not valid.', ['%mail' => 'invalid']));
+
+    $this->submitContact($this->randomMachineName(16), $recipients[0], '', $id, $this->randomMachineName(64));
+    $this->assertText(t('Subject field is required.'));
+
+    $this->submitContact($this->randomMachineName(16), $recipients[0], $this->randomMachineName(16), $id, '');
+    $this->assertText(t('Message field is required.'));
+
+    // Test contact form with no default form selected.
+    $this->config('contact.settings')
+      ->set('default_form', '')
+      ->save();
+    $this->drupalGet('contact');
+    $this->assertResponse(404);
+
+    // Try to access contact form with non-existing form IDs.
+    $this->drupalGet('contact/0');
+    $this->assertResponse(404);
+    $this->drupalGet('contact/' . $this->randomMachineName());
+    $this->assertResponse(404);
+
+    // Submit contact form with correct values and check flood interval.
+    for ($i = 0; $i < $flood_limit; $i++) {
+      $this->submitContact($this->randomMachineName(16), $recipients[0], $this->randomMachineName(16), $id, $this->randomMachineName(64));
+      $this->assertText(t('Your message has been sent.'));
+    }
+    // Submit contact form one over limit.
+    $this->submitContact($this->randomMachineName(16), $recipients[0], $this->randomMachineName(16), $id, $this->randomMachineName(64));
+    $this->assertRaw(t('You cannot send more than %number messages in 10 min. Try again later.', ['%number' => $this->config('contact.settings')->get('flood.limit')]));
+
+    // Test listing controller.
+    $this->drupalLogin($admin_user);
+
+    $this->deleteContactForms();
+
+    $label = $this->randomMachineName(16);
+    $recipients = implode(',', [$recipients[0], $recipients[1], $recipients[2]]);
+    $contact_form = Unicode::strtolower($this->randomMachineName(16));
+    $this->addContactForm($contact_form, $label, $recipients, '', FALSE);
+    $this->drupalGet('admin/structure/contact');
+    $this->clickLink(t('Edit'));
+    $this->assertResponse(200);
+    $this->assertFieldByName('label', $label);
+
+    // Test field UI and field integration.
+    $this->drupalGet('admin/structure/contact');
+
+    $view_link = $this->xpath('//table/tbody/tr/td/a[contains(@href, :href) and text()=:text]', [
+      ':href' => \Drupal::url('entity.contact_form.canonical', ['contact_form' => $contact_form]),
+      ':text' => $label,
+      ]
+    );
+    $this->assertTrue(!empty($view_link), 'Contact listing links to contact form.');
+
+    // Find out in which row the form we want to add a field to is.
+    foreach ($this->xpath('//table/tbody/tr') as $row) {
+      if ($row->findLink($label)) {
+        $row->clickLink('Manage fields');
+        break;
+      }
+    }
+
+    $this->assertResponse(200);
+    $this->clickLink(t('Add field'));
+    $this->assertResponse(200);
+
+    // Create a simple textfield.
+    $field_name = Unicode::strtolower($this->randomMachineName());
+    $field_label = $this->randomMachineName();
+    $this->fieldUIAddNewField(NULL, $field_name, $field_label, 'text');
+    $field_name = 'field_' . $field_name;
+
+    // Check preview field can be ordered.
+    $this->drupalGet('admin/structure/contact/manage/' . $contact_form . '/form-display');
+    $this->assertText(t('Preview'));
+
+    // Check that the field is displayed.
+    $this->drupalGet('contact/' . $contact_form);
+    $this->assertText($field_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(NULL, $edit, t('Send message'));
+    $mails = $this->getMails();
+    $mail = array_pop($mails);
+    $this->assertEqual($mail['subject'], t('[@label] @subject', ['@label' => $label, '@subject' => $edit['subject[0][value]']]));
+    $this->assertTrue(strpos($mail['body'], $field_label));
+    $this->assertTrue(strpos($mail['body'], $edit[$field_name . '[0][value]']));
+
+    // Test messages and redirect.
+    /** @var \Drupal\contact\ContactFormInterface $form */
+    $form = ContactForm::load($contact_form);
+    $form->setMessage('Thanks for your submission.');
+    $form->setRedirectPath('/user/' . $admin_user->id());
+    $form->save();
+    // Check that the field is displayed.
+    $this->drupalGet('contact/' . $contact_form);
+
+    // 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(NULL, $edit, t('Send message'));
+    $this->assertText('Thanks for your submission.');
+    $this->assertUrl('user/' . $admin_user->id());
+
+    // Test Empty message.
+    /** @var \Drupal\contact\ContactFormInterface $form */
+    $form = ContactForm::load($contact_form);
+    $form->setMessage('');
+    $form->setRedirectPath('/user/' . $admin_user->id());
+    $form->save();
+    $this->drupalGet('admin/structure/contact/manage/' . $contact_form);
+    // Check that the field is displayed.
+    $this->drupalGet('contact/' . $contact_form);
+
+    // 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(NULL, $edit, t('Send message'));
+    $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]']);
+  }
+
+  /**
+   * Tests auto-reply on the site-wide contact form.
+   */
+  public function testAutoReply() {
+    // Create and log in administrative user.
+    $admin_user = $this->drupalCreateUser([
+      'access site-wide contact form',
+      'administer contact forms',
+      'administer permissions',
+      'administer users',
+      'access site reports'
+    ]);
+    $this->drupalLogin($admin_user);
+
+    // Set up three forms, 2 with an auto-reply and one without.
+    $foo_autoreply = $this->randomMachineName(40);
+    $bar_autoreply = $this->randomMachineName(40);
+    $this->addContactForm('foo', 'foo', 'foo@example.com', $foo_autoreply, FALSE);
+    $this->addContactForm('bar', 'bar', 'bar@example.com', $bar_autoreply, FALSE);
+    $this->addContactForm('no_autoreply', 'no_autoreply', 'bar@example.com', '', FALSE);
+
+    // Log the current user out in order to test the name and email fields.
+    $this->drupalLogout();
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
+
+    // Test the auto-reply for form 'foo'.
+    $email = $this->randomMachineName(32) . '@example.com';
+    $subject = $this->randomMachineName(64);
+    $this->submitContact($this->randomMachineName(16), $email, $subject, 'foo', $this->randomString(128));
+
+    // We are testing the auto-reply, so there should be one email going to the sender.
+    $captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
+    $this->assertEqual(count($captured_emails), 1);
+    $this->assertEqual(trim($captured_emails[0]['body']), trim(MailFormatHelper::htmlToText($foo_autoreply)));
+
+    // Test the auto-reply for form 'bar'.
+    $email = $this->randomMachineName(32) . '@example.com';
+    $this->submitContact($this->randomMachineName(16), $email, $this->randomString(64), 'bar', $this->randomString(128));
+
+    // Auto-reply for form 'bar' should result in one auto-reply email to the sender.
+    $captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
+    $this->assertEqual(count($captured_emails), 1);
+    $this->assertEqual(trim($captured_emails[0]['body']), trim(MailFormatHelper::htmlToText($bar_autoreply)));
+
+    // Verify that no auto-reply is sent when the auto-reply field is left blank.
+    $email = $this->randomMachineName(32) . '@example.com';
+    $this->submitContact($this->randomMachineName(16), $email, $this->randomString(64), 'no_autoreply', $this->randomString(128));
+    $captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
+    $this->assertEqual(count($captured_emails), 0);
+
+    // Verify that the current error message doesn't show, that the auto-reply
+    // doesn't get sent and the correct silent error gets logged.
+    $email = '';
+    entity_get_form_display('contact_message', 'foo', 'default')
+      ->removeComponent('mail')
+      ->save();
+    $this->submitContact($this->randomMachineName(16), $email, $this->randomString(64), 'foo', $this->randomString(128));
+    $this->assertNoText('Unable to send email. Contact the site administrator if the problem persists.');
+    $captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
+    $this->assertEqual(count($captured_emails), 0);
+    $this->drupalLogin($admin_user);
+    $this->drupalGet('admin/reports/dblog');
+    $this->assertRaw('Error sending auto-reply, missing sender e-mail address in foo');
+  }
+
+  /**
+   * Adds a form.
+   *
+   * @param string $id
+   *   The form machine name.
+   * @param string $label
+   *   The form label.
+   * @param string $recipients
+   *   The list of recipient email addresses.
+   * @param string $reply
+   *   The auto-reply text that is sent to a user upon completing the contact
+   *   form.
+   * @param bool $selected
+   *   A Boolean indicating whether the form should be selected by default.
+   * @param string $message
+   *   The message that will be displayed to a user upon completing the contact
+   *   form.
+   * @param array $third_party_settings
+   *   Array of third party settings to be added to the posted form data.
+   */
+  public function addContactForm($id, $label, $recipients, $reply, $selected, $message = 'Your message has been sent.', $third_party_settings = []) {
+    $edit = [];
+    $edit['label'] = $label;
+    $edit['id'] = $id;
+    $edit['message'] = $message;
+    $edit['recipients'] = $recipients;
+    $edit['reply'] = $reply;
+    $edit['selected'] = ($selected ? TRUE : FALSE);
+    $edit += $third_party_settings;
+    $this->drupalPostForm('admin/structure/contact/add', $edit, t('Save'));
+  }
+
+  /**
+   * Updates a form.
+   *
+   * @param string $id
+   *   The form machine name.
+   * @param string $label
+   *   The form label.
+   * @param string $recipients
+   *   The list of recipient email addresses.
+   * @param string $reply
+   *   The auto-reply text that is sent to a user upon completing the contact
+   *   form.
+   * @param bool $selected
+   *   A Boolean indicating whether the form should be selected by default.
+   * @param string $message
+   *   The message that will be displayed to a user upon completing the contact
+   *   form.
+   * @param string $redirect
+   *   The path where user will be redirect after this form has been submitted..
+   */
+  public function updateContactForm($id, $label, $recipients, $reply, $selected, $message = 'Your message has been sent.', $redirect = '/') {
+    $edit = [];
+    $edit['label'] = $label;
+    $edit['recipients'] = $recipients;
+    $edit['reply'] = $reply;
+    $edit['selected'] = ($selected ? TRUE : FALSE);
+    $edit['message'] = $message;
+    $edit['redirect'] = $redirect;
+    $this->drupalPostForm("admin/structure/contact/manage/$id", $edit, t('Save'));
+  }
+
+  /**
+   * Submits the contact form.
+   *
+   * @param string $name
+   *   The name of the sender.
+   * @param string $mail
+   *   The email address of the sender.
+   * @param string $subject
+   *   The subject of the message.
+   * @param string $id
+   *   The form ID of the message.
+   * @param string $message
+   *   The message body.
+   */
+  public function submitContact($name, $mail, $subject, $id, $message) {
+    $edit = [];
+    $edit['name'] = $name;
+    $edit['mail'] = $mail;
+    $edit['subject[0][value]'] = $subject;
+    $edit['message[0][value]'] = $message;
+    if ($id == $this->config('contact.settings')->get('default_form')) {
+      $this->drupalPostForm('contact', $edit, t('Send message'));
+    }
+    else {
+      $this->drupalPostForm('contact/' . $id, $edit, t('Send message'));
+    }
+  }
+
+  /**
+   * Deletes all forms.
+   */
+  public function deleteContactForms() {
+    $contact_forms = ContactForm::loadMultiple();;
+    foreach ($contact_forms as $id => $contact_form) {
+      if ($id == 'personal') {
+        // Personal form could not be deleted.
+        $this->drupalGet("admin/structure/contact/manage/$id/delete");
+        $this->assertResponse(403);
+      }
+      else {
+        $this->drupalPostForm("admin/structure/contact/manage/$id/delete", [], t('Delete'));
+        $this->assertRaw(t('The contact form %label has been deleted.', ['%label' => $contact_form->label()]));
+        $this->assertFalse(ContactForm::load($id), format_string('Form %contact_form not found', ['%contact_form' => $contact_form->label()]));
+      }
+    }
+  }
+
+}

core/modules/contact/tests/src/Functional/ContactStorageTest.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\Tests\contact\Functional;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\contact\Entity\Message;
+use Drupal\user\RoleInterface;
+
+/**
+ * Tests storing contact messages.
+ *
+ * Note that the various test methods in ContactSitewideTest are also run by
+ * this test. This is by design to ensure that regular contact.module functions
+ * continue to work when a storage handler other than ContentEntityNullStorage
+ * is enabled for contact Message entities.
+ *
+ * @group contact
+ */
+class ContactStorageTest extends ContactSitewideTest {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'block',
+    'text',
+    'contact',
+    'field_ui',
+    'contact_storage_test',
+    'contact_test',
+  ];
+
+  /**
+   * Tests configuration options and the site-wide contact form.
+   */
+  public function testContactStorage() {
+    // Create and log in administrative user.
+    $admin_user = $this->drupalCreateUser([
+      'access site-wide contact form',
+      'administer contact forms',
+      'administer users',
+      'administer account settings',
+      'administer contact_message fields',
+    ]);
+    $this->drupalLogin($admin_user);
+    // Create first valid contact form.
+    $mail = 'simpletest@example.com';
+    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', [$mail]), '', TRUE, 'Your message has been sent.', [
+      'send_a_pony' => 1,
+    ]);
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
+
+    // Ensure that anonymous can submit site-wide contact form.
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
+    $this->drupalLogout();
+    $this->drupalGet('contact');
+    $this->assertText(t('Your email address'));
+    $this->assertNoText(t('Form'));
+    $this->submitContact($name = $this->randomMachineName(16), $mail, $subject = $this->randomMachineName(16), $id, $message = $this->randomMachineName(64));
+    $this->assertText(t('Your message has been sent.'));
+
+    $messages = Message::loadMultiple();
+    /** @var \Drupal\contact\Entity\Message $message */
+    $message = reset($messages);
+    $this->assertEqual($message->getContactForm()->id(), $id);
+    $this->assertTrue($message->getContactForm()->getThirdPartySetting('contact_storage_test', 'send_a_pony', FALSE));
+    $this->assertEqual($message->getSenderName(), $name);
+    $this->assertEqual($message->getSubject(), $subject);
+    $this->assertEqual($message->getSenderMail(), $mail);
+
+    $config = $this->config("contact.form.$id");
+    $this->assertEqual($config->get('id'), $id);
+  }
+
+}

core/modules/contact/tests/src/Functional/Views/ContactFieldsTest.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\Tests\contact\Functional\Views;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\views\Functional\ViewTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\contact\Entity\ContactForm;
+
+/**
+ * Tests which checks that no fieldapi fields are added on contact.
+ *
+ * @group contact
+ */
+class ContactFieldsTest extends ViewTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['field', 'text', 'contact'];
+
+  /**
+   * Contains the field storage definition for contact used for this test.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig
+   */
+  protected $fieldStorage;
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->fieldStorage = FieldStorageConfig::create([
+      'field_name' => strtolower($this->randomMachineName()),
+      'entity_type' => 'contact_message',
+      'type' => 'text'
+    ]);
+    $this->fieldStorage->save();
+
+    ContactForm::create([
+      'id' => 'contact_message',
+      'label' => 'Test contact form',
+    ])->save();
+
+    FieldConfig::create([
+      'field_storage' => $this->fieldStorage,
+      'bundle' => 'contact_message',
+    ])->save();
+
+    $this->container->get('views.views_data')->clear();
+  }
+
+  /**
+   * Tests the views data generation.
+   */
+  public function testViewsData() {
+    // Test that the field is not exposed to views, since contact_message
+    // entities have no storage.
+    $table_name = 'contact_message__' . $this->fieldStorage->getName();
+    $data = $this->container->get('views.views_data')->get($table_name);
+    $this->assertFalse($data, 'The field is not exposed to Views.');
+  }
+
+}

core/modules/contact/tests/src/Functional/Views/ContactLinkTest.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace Drupal\Tests\contact\Functional\Views;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Tests\views\Functional\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests the contact link field.
+ *
+ * @group contact
+ * @see \Drupal\contact\Plugin\views\field\ContactLink.
+ */
+class ContactLinkTest extends ViewTestBase {
+
+  /**
+   * Stores the user data service used by the test.
+   *
+   * @var \Drupal\user\UserDataInterface
+   */
+  public $userData;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['contact_test_views'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_contact_link'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    ViewTestData::createTestViews(get_class($this), ['contact_test_views']);
+
+    $this->userData = $this->container->get('user.data');
+  }
+
+  /**
+   * Tests contact link.
+   */
+  public function testContactLink() {
+    $accounts = [];
+    $accounts['root'] = User::load(1);
+    // Create an account with access to all contact pages.
+    $admin_account = $this->drupalCreateUser(['administer users']);
+    $accounts['admin'] = $admin_account;
+    // Create an account with no access to contact pages.
+    $no_contact_account = $this->drupalCreateUser();
+    $accounts['no_contact'] = $no_contact_account;
+
+    // Create an account with access to contact pages.
+    $contact_account = $this->drupalCreateUser(['access user contact forms']);
+    $accounts['contact'] = $contact_account;
+
+    $this->drupalLogin($admin_account);
+    $this->drupalGet('test-contact-link');
+    // The admin user has access to all contact links beside his own.
+    $this->assertContactLinks($accounts, ['root', 'no_contact', 'contact']);
+
+    $this->drupalLogin($no_contact_account);
+    $this->drupalGet('test-contact-link');
+    // Ensure that the user without the permission doesn't see any link.
+    $this->assertContactLinks($accounts, []);
+
+    $this->drupalLogin($contact_account);
+    $this->drupalGet('test-contact-link');
+    $this->assertContactLinks($accounts, ['root', 'admin', 'no_contact']);
+
+    // Disable contact link for no_contact.
+    $this->userData->set('contact', $no_contact_account->id(), 'enabled', FALSE);
+    // @todo Remove cache invalidation in https://www.drupal.org/node/2477903.
+    Cache::invalidateTags($no_contact_account->getCacheTagsToInvalidate());
+    $this->drupalGet('test-contact-link');
+    $this->assertContactLinks($accounts, ['root', 'admin']);
+  }
+
+  /**
+   * Asserts whether certain users contact links appear on the page.
+   *
+   * @param array $accounts
+   *   All user objects used by the test.
+   * @param array $names
+   *   Users which should have contact links.
+   */
+  public function assertContactLinks(array $accounts, array $names) {
+    $result = $this->xpath('//div[contains(@class, "views-field-contact")]//a');
+    $this->assertEqual(count($result), count($names));
+    foreach ($names as $name) {
+      $account = $accounts[$name];
+
+      $result = $this->xpath('//div[contains(@class, "views-field-contact")]//a[contains(@href, :url)]', [':url' => $account->url('contact-form')]);
+      $this->assertTrue(count($result));
+    }
+  }
+
+}

core/modules/contact/tests/src/Kernel/MessageEntityTest.php

@@ -17,17 +17,17 @@ class MessageEntityTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'system',
     'contact',
     'field',
     'user',
     'contact_test',
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('contact', 'contact_test'));
+    $this->installConfig(['contact', 'contact_test']);
   }
 
   /**
@@ -35,7 +35,7 @@ class MessageEntityTest extends EntityKernelTestBase {
    */
   public function testMessageMethods() {
     $message_storage = $this->container->get('entity.manager')->getStorage('contact_message');
-    $message = $message_storage->create(array('contact_form' => 'feedback'));
+    $message = $message_storage->create(['contact_form' => 'feedback']);
 
     // Check for empty values first.
     $this->assertEqual($message->getMessage(), '');

core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php

@@ -18,7 +18,7 @@ class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
    *
    * @var array
    */
-  public static $modules = array('contact');
+  public static $modules = ['contact'];
 
   /**
    * {@inheritdoc}
@@ -59,6 +59,26 @@ class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
     $this->assertEntity('website_feedback', 'Website feedback', ['admin@example.com'], '', 0);
     $this->assertEntity('some_other_category', 'Some other category', ['test@example.com'], 'Thanks for contacting us, we will reply ASAP!', 1);
     $this->assertEntity('a_category_much_longer_than_thir', 'A category much longer than thirty two characters', ['fortyninechars@example.com'], '', 2);
+
+    // Test there are no duplicated roles.
+    $contact_forms = [
+      'website_feedback1',
+      'some_other_category1',
+      'a_category_much_longer_than_thir1',
+    ];
+    $this->assertEmpty(ContactForm::loadMultiple($contact_forms));
+
+    /*
+     * Remove the map row for the Website feedback contact form so that it
+     * can be migrated again.
+     */
+    $id_map = $this->getMigration('contact_category')->getIdMap();
+    $id_map->delete(['cid' => '1']);
+    $this->executeMigration('contact_category');
+
+    // Test there is a duplicate Website feedback form.
+    $contact_form = ContactForm::load('website_feedback1');
+    $this->assertEntity('website_feedback1', 'Website feedback', ['admin@example.com'], '', 0);
   }
 
 }

core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\contact\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/contact/tests/src/Kernel/Plugin/migrate/source/ContactCategoryTest.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\Tests\contact\Kernel\Plugin\migrate\source;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests D6 contact category source plugin.
+ *
+ * @covers \Drupal\contact\Plugin\migrate\source\ContactCategory
+ * @group contact
+ */
+class ContactCategoryTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['contact', 'migrate_drupal', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $tests = [
+      [
+        'source_data' => [],
+        'expected_data' => [],
+      ],
+    ];
+
+    $tests[0]['expected_data'] = [
+      [
+        'cid' => 1,
+        'category' => 'contact category value 1',
+        'recipients' => ['admin@example.com', 'user@example.com'],
+        'reply' => 'auto reply value 1',
+        'weight' => 0,
+        'selected' => 0,
+      ],
+      [
+        'cid' => 2,
+        'category' => 'contact category value 2',
+        'recipients' => ['admin@example.com', 'user@example.com'],
+        'reply' => 'auto reply value 2',
+        'weight' => 0,
+        'selected' => 0,
+      ],
+    ];
+
+    foreach ($tests[0]['expected_data'] as $k => $row) {
+      $row['recipients'] = implode(',', $row['recipients']);
+      $tests[0]['source_data']['contact'][$k] = $row;
+    }
+    return $tests;
+  }
+
+}

core/modules/contact/tests/src/Kernel/Plugin/migrate/source/d6/ContactSettingsTest.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\Tests\contact\Kernel\Plugin\migrate\source\d6;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests D6 contact settings source plugin.
+ *
+ * @covers \Drupal\contact\Plugin\migrate\source\ContactSettings
+ * @group contact
+ */
+class ContactSettingsTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['contact', 'migrate_drupal', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $tests = [];
+
+    $tests[0]['source_data']['variable'] = [
+      [
+        'name' => 'site_name',
+        'value' => serialize('Blorf!'),
+      ],
+    ];
+    $tests[0]['source_data']['contact'] = [
+      [
+        'cid' => '1',
+        'category' => 'Website feedback',
+        'recipients' => 'admin@example.com',
+        'reply' => '',
+        'weight' => '0',
+        'selected' => '1',
+      ]
+    ];
+    $tests[0]['expected_data'] = [
+      [
+        'default_category' => '1',
+        'site_name' => 'Blorf!',
+      ],
+    ];
+    $tests[0]['expected_count'] = NULL;
+    $tests[0]['configuration']['variables'] = ['site_name'];
+
+    return $tests;
+  }
+
+}

core/modules/contact/tests/src/Unit/MailHandlerTest.php

@@ -3,6 +3,7 @@
 namespace Drupal\Tests\contact\Unit;
 
 use Drupal\contact\MailHandler;
+use Drupal\contact\MailHandlerException;
 use Drupal\contact\MessageInterface;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Session\AccountInterface;
@@ -80,7 +81,7 @@ class MailHandlerTest extends UnitTestCase {
 
     $string_translation = $this->getStringTranslationStub();
     $this->contactMailHandler = new MailHandler($this->mailManager, $this->languageManager, $this->logger, $string_translation, $this->entityManager);
-    $language = new Language(array('id' => 'en'));
+    $language = new Language(['id' => 'en']);
 
     $this->languageManager->expects($this->any())
       ->method('getDefaultLanguage')
@@ -94,9 +95,6 @@ class MailHandlerTest extends UnitTestCase {
   /**
    * Tests the children() method with an invalid key.
    *
-   * @expectedException \Drupal\contact\MailHandlerException
-   * @expectedExceptionMessage Unable to determine message recipient
-   *
    * @covers ::sendMailMessages
    */
   public function testInvalidRecipient() {
@@ -121,6 +119,7 @@ class MailHandlerTest extends UnitTestCase {
     $sender->expects($this->once())
       ->method('isAnonymous')
       ->willReturn(FALSE);
+    $this->setExpectedException(MailHandlerException::class, 'Unable to determine message recipient');
     $this->contactMailHandler->sendMailMessages($message, $sender);
   }
 
@@ -156,76 +155,76 @@ class MailHandlerTest extends UnitTestCase {
    * Data provider for ::testSendMailMessages.
    */
   public function getSendMailMessages() {
-    $data = array();
-    $recipients = array('admin@drupal.org', 'user@drupal.org');
-    $default_result = array(
+    $data = [];
+    $recipients = ['admin@drupal.org', 'user@drupal.org'];
+    $default_result = [
       'module' => 'contact',
       'key' => '',
       'to' => implode(', ', $recipients),
       'langcode' => 'en',
-      'params' => array(),
+      'params' => [],
       'from' => 'anonymous@drupal.org',
-    );
-    $results = array();
+    ];
+    $results = [];
     $message = $this->getAnonymousMockMessage($recipients, '');
     $sender = $this->getMockSender();
-    $result = array(
+    $result = [
       'key' => 'page_mail',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'contact_form' => $message->getContactForm(),
-      ),
-    );
+      ],
+    ];
     $results[] = $result + $default_result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
-    $results = array();
+    $results = [];
     $message = $this->getAnonymousMockMessage($recipients, 'reply');
     $sender = $this->getMockSender();
-    $result = array(
+    $result = [
       'key' => 'page_mail',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'contact_form' => $message->getContactForm(),
-      ),
-    );
+      ],
+    ];
     $results[] = $result + $default_result;
     $result['key'] = 'page_autoreply';
     $result['to'] = 'anonymous@drupal.org';
     $result['from'] = NULL;
     $results[] = $result + $default_result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
-    $results = array();
+    $results = [];
     $message = $this->getAnonymousMockMessage($recipients, '', TRUE);
     $sender = $this->getMockSender();
-    $result = array(
+    $result = [
       'key' => 'page_mail',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'contact_form' => $message->getContactForm(),
-      ),
-    );
+      ],
+    ];
     $results[] = $result + $default_result;
     $result['key'] = 'page_copy';
     $result['to'] = 'anonymous@drupal.org';
     $results[] = $result + $default_result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
-    $results = array();
+    $results = [];
     $message = $this->getAnonymousMockMessage($recipients, 'reply', TRUE);
     $sender = $this->getMockSender();
-    $result = array(
+    $result = [
       'key' => 'page_mail',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'contact_form' => $message->getContactForm(),
-      ),
-    );
+      ],
+    ];
     $results[] = $result + $default_result;
     $result['key'] = 'page_copy';
     $result['to'] = 'anonymous@drupal.org';
@@ -233,48 +232,48 @@ class MailHandlerTest extends UnitTestCase {
     $result['key'] = 'page_autoreply';
     $result['from'] = NULL;
     $results[] = $result + $default_result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
     //For authenticated user.
-    $results = array();
+    $results = [];
     $message = $this->getAuthenticatedMockMessage();
     $sender = $this->getMockSender(FALSE, 'user@drupal.org');
-    $result = array(
+    $result = [
       'module' => 'contact',
       'key' => 'user_mail',
       'to' => 'user2@drupal.org',
       'langcode' => 'en',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'recipient' => $message->getPersonalRecipient(),
-      ),
+      ],
       'from' => 'user@drupal.org',
-    );
+    ];
     $results[] = $result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
-    $results = array();
+    $results = [];
     $message = $this->getAuthenticatedMockMessage(TRUE);
     $sender = $this->getMockSender(FALSE, 'user@drupal.org');
-    $result = array(
+    $result = [
       'module' => 'contact',
       'key' => 'user_mail',
       'to' => 'user2@drupal.org',
       'langcode' => 'en',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'recipient' => $message->getPersonalRecipient(),
-      ),
+      ],
       'from' => 'user@drupal.org',
-    );
+    ];
     $results[] = $result;
 
     $result['key'] = 'user_copy';
     $result['to'] = $result['from'];
     $results[] = $result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
     return $data;
   }
@@ -299,7 +298,7 @@ class MailHandlerTest extends UnitTestCase {
       ->method('getEmail')
       ->willReturn($mail_address);
     $sender->expects($this->any())
-      ->method('getUsername')
+      ->method('getDisplayName')
       ->willReturn('user');
     // User ID 1 has special implications, use 3 instead.
     $sender->expects($this->any())
@@ -369,7 +368,7 @@ class MailHandlerTest extends UnitTestCase {
       ->method('getEmail')
       ->willReturn('user2@drupal.org');
     $recipient->expects($this->once())
-      ->method('getUsername')
+      ->method('getDisplayName')
       ->willReturn('user2');
     $recipient->expects($this->once())
       ->method('getPreferredLangcode')