Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / block / tests / src / Kernel / BlockRebuildTest.php

diff --git a/web/core/modules/block/tests/src/Kernel/BlockRebuildTest.php b/web/core/modules/block/tests/src/Kernel/BlockRebuildTest.php
index 33de12ce87d8d69dda68e1284a56df6381d12122..2443c21052ff1d7bddf480ef6dba7ea8081833c3 100644 (file)
--- a/web/core/modules/block/tests/src/Kernel/BlockRebuildTest.php
+++ b/web/core/modules/block/tests/src/Kernel/BlockRebuildTest.php
@@ -47,7 +47,8 @@ class BlockRebuildTest extends KernelTestBase {
    */
   public function testRebuildNoBlocks() {
     block_rebuild();
-    $messages = drupal_get_messages();
+    $messages = \Drupal::messenger()->all();
+    \Drupal::messenger()->deleteAll();
     $this->assertEquals([], $messages);
   }
 
@@ -58,7 +59,8 @@ class BlockRebuildTest extends KernelTestBase {
     $this->placeBlock('system_powered_by_block', ['region' => 'content']);
 
     block_rebuild();
-    $messages = drupal_get_messages();
+    $messages = \Drupal::messenger()->all();
+    \Drupal::messenger()->deleteAll();
     $this->assertEquals([], $messages);
   }
 
@@ -89,7 +91,8 @@ class BlockRebuildTest extends KernelTestBase {
     $block1 = Block::load($block1->id());
     $block2 = Block::load($block2->id());
 
-    $messages = drupal_get_messages();
+    $messages = \Drupal::messenger()->all();
+    \Drupal::messenger()->deleteAll();
     $expected = ['warning' => [new TranslatableMarkup('The block %info was assigned to the invalid region %region and has been disabled.', ['%info' => $block1->id(), '%region' => 'INVALID'])]];
     $this->assertEquals($expected, $messages);