updated core to 8.6.1 via composer

core/modules/action/action.module

@@ -29,8 +29,9 @@ function action_help($route_name, RouteMatchInterface $route_match) {
       $output = '<p>' . t('There are two types of actions: simple and advanced. Simple actions do not require any additional configuration and are listed here automatically. Advanced actions need to be created and configured before they can be used because they have options that need to be specified; for example, sending an email to a specified address or unpublishing content containing certain words. To create an advanced action, select the action from the drop-down list in the advanced action section below and click the <em>Create</em> button.') . '</p>';
       return $output;
 
+    case 'action.admin_add':
     case 'entity.action.edit_form':
-      return t('An advanced action offers additional configuration options which may be filled out below. Changing the <em>Description</em> field is recommended in order to better identify the precise action taking place.');
+      return t('An advanced action offers additional configuration options which may be filled out below. Changing the <em>Label</em> field is recommended in order to better identify the precise action taking place.');
   }
 }
 

core/modules/action/action.routing.yml

@@ -29,4 +29,3 @@ entity.action.delete_form:
     _title: 'Delete'
   requirements:
     _permission: 'administer actions'
-

core/modules/action/src/ActionFormBase.php

@@ -132,7 +132,7 @@ abstract class ActionFormBase extends EntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $this->entity->save();
-    drupal_set_message($this->t('The action has been successfully saved.'));
+    $this->messenger()->addStatus($this->t('The action has been successfully saved.'));
 
     $form_state->setRedirect('entity.action.collection');
   }

core/modules/action/src/Form/ActionAdminManageForm.php

@@ -72,7 +72,7 @@ class ActionAdminManageForm extends FormBase {
       '#empty_option' => $this->t('- Select -'),
     ];
     $form['parent']['actions'] = [
-      '#type' => 'actions'
+      '#type' => 'actions',
     ];
     $form['parent']['actions']['submit'] = [
       '#type' => 'submit',

core/modules/action/src/Plugin/Action/EmailAction.php

@@ -139,12 +139,11 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
     }
     $params = ['context' => $this->configuration];
 
-    if ($this->mailManager->mail('system', 'action_send_email', $recipient, $langcode, $params)) {
+    $message = $this->mailManager->mail('system', 'action_send_email', $recipient, $langcode, $params);
+    // Error logging is handled by \Drupal\Core\Mail\MailManager::mail().
+    if ($message['result']) {
       $this->logger->notice('Sent email to %recipient', ['%recipient' => $recipient]);
     }
-    else {
-      $this->logger->error('Unable to send email to %recipient', ['%recipient' => $recipient]);
-    }
   }
 
   /**

core/modules/action/src/Plugin/Action/MessageAction.php

@@ -5,6 +5,7 @@ namespace Drupal\action\Plugin\Action;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Action\ConfigurableActionBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -36,6 +37,13 @@ class MessageAction extends ConfigurableActionBase implements ContainerFactoryPl
    */
   protected $renderer;
 
+  /**
+   * The messenger.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a MessageAction object.
    *
@@ -49,19 +57,22 @@ class MessageAction extends ConfigurableActionBase implements ContainerFactoryPl
    *   The token service.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, Token $token, RendererInterface $renderer) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, Token $token, RendererInterface $renderer, MessengerInterface $messenger) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
     $this->token = $token;
     $this->renderer = $renderer;
+    $this->messenger = $messenger;
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition, $container->get('token'), $container->get('renderer'));
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('token'), $container->get('renderer'), $container->get('messenger'));
   }
 
   /**
@@ -77,7 +88,7 @@ class MessageAction extends ConfigurableActionBase implements ContainerFactoryPl
     ];
 
     // @todo Fix in https://www.drupal.org/node/2577827
-    drupal_set_message($this->renderer->renderPlain($build));
+    $this->messenger->addStatus($this->renderer->renderPlain($build));
   }
 
   /**

core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml

@@ -5,6 +5,6 @@ package: Testing
 version: VERSION
 core: 8.x
 dependencies:
-  - action
-  - views
-  - node
+  - drupal:action
+  - drupal:views
+  - drupal:node

core/modules/action/tests/src/Functional/ActionListTest.php

@@ -28,10 +28,10 @@ class ActionListTest extends BrowserTestBase {
     // Ensure the empty text appears on the action list page.
     /** @var $storage \Drupal\Core\Entity\EntityStorageInterface */
     $storage = $this->container->get('entity.manager')->getStorage('action');
-    $actions  = $storage->loadMultiple();
+    $actions = $storage->loadMultiple();
     $storage->delete($actions);
     $this->drupalGet('/admin/config/system/actions');
-    $this->assertRaw('There is no Action yet.');
+    $this->assertRaw('There are no actions yet.');
   }
 
 }

core/modules/action/tests/src/Functional/BulkFormTest.php

@@ -148,7 +148,7 @@ class BulkFormTest extends BrowserTestBase {
     $errors = $this->xpath('//div[contains(@class, "messages--status")]');
     $this->assertFalse($errors, 'No action message shown.');
     $this->drupalPostForm(NULL, [], t('Delete'));
-    $this->assertText(t('Deleted 5 posts.'));
+    $this->assertText(t('Deleted 5 content items.'));
     // Check if we got redirected to the original page.
     $this->assertUrl('test_bulk_form');
   }

core/modules/action/tests/src/FunctionalJavascript/ActionFormAjaxTest.php

@@ -3,7 +3,7 @@
 namespace Drupal\Tests\action\FunctionalJavascript;
 
 use Drupal\Core\Url;
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 use Drupal\system\Entity\Action;
 
 /**
@@ -11,7 +11,7 @@ use Drupal\system\Entity\Action;
  *
  * @group action
  */
-class ActionFormAjaxTest extends JavascriptTestBase {
+class ActionFormAjaxTest extends WebDriverTestBase {
 
   /**
    * {@inheritdoc}
@@ -33,16 +33,15 @@ class ActionFormAjaxTest extends JavascriptTestBase {
   public function testActionConfigurationWithAjax() {
     $url = Url::fromRoute('action.admin_add', ['action_id' => 'action_form_ajax_test']);
     $this->drupalGet($url);
-    $this->assertSession()->statusCodeEquals(200);
     $page = $this->getSession()->getPage();
 
     $id = 'test_plugin';
-    $page->find('css', '[name="id"]')
-      ->setValue($id);
+    $this->assertSession()->waitForElementVisible('named', ['button', 'Edit'])->press();
+    $this->assertSession()->waitForElementVisible('css', '[name="id"]')->setValue($id);
 
     $page->find('css', '[name="having_a_party"]')
       ->check();
-    $this->assertSession()->waitForElement('css', '[name="party_time"]');
+    $this->assertSession()->waitForElementVisible('css', '[name="party_time"]');
 
     $party_time = 'Evening';
     $page->find('css', '[name="party_time"]')
@@ -54,7 +53,6 @@ class ActionFormAjaxTest extends JavascriptTestBase {
     $url = Url::fromRoute('entity.action.collection');
     $this->assertSession()->pageTextContains('The action has been successfully saved.');
     $this->assertSession()->addressEquals($url);
-    $this->assertSession()->statusCodeEquals(200);
 
     // Check storage.
     $instance = Action::load($id);

core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php

@@ -40,7 +40,7 @@ class MigrateActionsTest extends MigrateDrupal6TestBase {
     $this->assertEntity('send_e_mail', 'Send e-mail', 'system', [
       "recipient" => "test@example.com",
       "subject" => "Drupal migration test",
-      "message" => "Drupal migration test"
+      "message" => "Drupal migration test",
     ]);
     $this->assertEntity('redirect_to_url', 'Redirect to URL', 'system', ["url" => "https://www.drupal.org"]);
 

core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php

@@ -40,7 +40,7 @@ class MigrateActionsTest extends MigrateDrupal7TestBase {
     $this->assertEntity('send_e_mail', 'Send e-mail', 'system', [
       "recipient" => "test@example.com",
       "subject" => "Drupal migration test",
-      "message" => "Drupal migration test"
+      "message" => "Drupal migration test",
     ]);
     $this->assertEntity('redirect_to_url', 'Redirect to URL', 'system', ["url" => "https://www.drupal.org"]);
 

core/modules/action/tests/src/Kernel/Plugin/Action/EmailActionTest.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\Tests\action\Kernel\Plugin\Action;
+
+use Drupal\Core\Test\AssertMailTrait;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests for the EmailAction plugin.
+ *
+ * @group action
+ */
+class EmailActionTest extends KernelTestBase {
+  use AssertMailTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'user', 'action', 'dblog'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('user');
+    $this->installSchema('dblog', ['watchdog']);
+  }
+
+  /**
+   * Test the email action plugin.
+   */
+  public function testEmailAction() {
+    /** @var \Drupal\Core\Action\ActionManager $plugin_manager */
+    $plugin_manager = $this->container->get('plugin.manager.action');
+    $configuration = [
+      'recipient' => 'test@example.com',
+      'subject' => 'Test subject',
+      'message' => 'Test message',
+    ];
+    $plugin_manager
+      ->createInstance('action_send_email_action', $configuration)
+      ->execute();
+
+    $mails = $this->getMails();
+    $this->assertCount(1, $this->getMails());
+    $this->assertEquals('test@example.com', $mails[0]['to']);
+    $this->assertEquals('Test subject', $mails[0]['subject']);
+    $this->assertEquals("Test message\n", $mails[0]['body']);
+
+    // Ensure that the email sending is logged.
+    $log = \Drupal::database()
+      ->select('watchdog', 'w')
+      ->fields('w', ['message', 'variables'])
+      ->orderBy('wid', 'DESC')
+      ->range(0, 1)
+      ->execute()
+      ->fetch();
+
+    $this->assertEquals($log->message, 'Sent email to %recipient');
+    $variables = unserialize($log->variables);
+    $this->assertEquals($variables['%recipient'], 'test@example.com');
+  }
+
+}