Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / system / tests / src / Functional / DrupalKernel / ContainerRebuildWebTest.php

diff --git a/web/core/modules/system/src/Tests/DrupalKernel/ContainerRebuildWebTest.php b/web/core/modules/system/tests/src/Functional/DrupalKernel/ContainerRebuildWebTest.php
similarity index 63%
rename from web/core/modules/system/src/Tests/DrupalKernel/ContainerRebuildWebTest.php
rename to web/core/modules/system/tests/src/Functional/DrupalKernel/ContainerRebuildWebTest.php
index c87e3ad8eb0ecdc506fd54ecf2061046fa1dd2aa..828b92f2891341442847d94ceb57a6a4d406faa9 100644 (file)
--- a/web/core/modules/system/src/Tests/DrupalKernel/ContainerRebuildWebTest.php
+++ b/web/core/modules/system/tests/src/Functional/DrupalKernel/ContainerRebuildWebTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\DrupalKernel;
+namespace Drupal\Tests\system\Functional\DrupalKernel;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Ensures that the container rebuild works as expected.
  *
  * @group DrupalKernel
  */
-class ContainerRebuildWebTest extends WebTestBase {
+class ContainerRebuildWebTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
@@ -20,36 +20,40 @@ class ContainerRebuildWebTest extends WebTestBase {
    * Sets a different deployment identifier.
    */
   public function testSetContainerRebuildWithDifferentDeploymentIdentifier() {
+    $assert = $this->assertSession();
+
+    // Ensure the parameter is not set.
     $this->drupalGet('<front>');
-    $this->assertHeader('container_rebuild_indicator', FALSE);
+    $assert->responseHeaderEquals('container_rebuild_indicator', NULL);
 
     $this->writeSettings(['settings' => ['deployment_identifier' => (object) ['value' => 'new-identifier', 'required' => TRUE]]]);
 
     $this->drupalGet('<front>');
 
-    $this->assertHeader('container_rebuild_indicator', 'new-identifier');
+    $assert->responseHeaderEquals('container_rebuild_indicator', 'new-identifier');
   }
 
   /**
    * Tests container invalidation.
    */
   public function testContainerInvalidation() {
+    $assert = $this->assertSession();
 
     // Ensure that parameter is not set.
     $this->drupalGet('<front>');
-    $this->assertHeader('container_rebuild_test_parameter', FALSE);
+    $assert->responseHeaderEquals('container_rebuild_test_parameter', NULL);
 
     // Ensure that after setting the parameter, without a container rebuild the
     // parameter is still not set.
     $this->writeSettings(['settings' => ['container_rebuild_test_parameter' => (object) ['value' => 'rebuild_me_please', 'required' => TRUE]]]);
 
     $this->drupalGet('<front>');
-    $this->assertHeader('container_rebuild_test_parameter', FALSE);
+    $assert->responseHeaderEquals('container_rebuild_test_parameter', NULL);
 
     // Ensure that after container invalidation the parameter is set.
     \Drupal::service('kernel')->invalidateContainer();
     $this->drupalGet('<front>');
-    $this->assertHeader('container_rebuild_test_parameter', 'rebuild_me_please');
+    $assert->responseHeaderEquals('container_rebuild_test_parameter', 'rebuild_me_please');
   }
 
 }