X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fsystem%2Ftests%2Fsrc%2FFunctional%2FSystem%2FPageNotFoundTest.php;fp=web%2Fcore%2Fmodules%2Fsystem%2Fsrc%2FTests%2FSystem%2FPageNotFoundTest.php;h=ab9b54b491d03ae9ae960b71525d316078d48371;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hp=b1a88d827b015d35280ec4cdf298b08fbb107991;hpb=74df008bdbb3a11eeea356744f39b802369bda3c;p=yaffs-website

diff --git a/web/core/modules/system/src/Tests/System/PageNotFoundTest.php b/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
similarity index 85%
rename from web/core/modules/system/src/Tests/System/PageNotFoundTest.php
rename to web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
index b1a88d827..ab9b54b49 100644
--- a/web/core/modules/system/src/Tests/System/PageNotFoundTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
 use Drupal\user\RoleInterface;
 
 /**
@@ -11,7 +12,9 @@ use Drupal\user\RoleInterface;
  *
  * @group system
  */
-class PageNotFoundTest extends WebTestBase {
+class PageNotFoundTest extends BrowserTestBase {
+
+  use AssertPageCacheContextsAndTagsTrait;
 
   /**
    * Modules to enable.
@@ -44,7 +47,7 @@ class PageNotFoundTest extends WebTestBase {
       'site_404' => 'user/' . $this->adminUser->id(),
     ];
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
-    $this->assertRaw(SafeMarkup::format("The path '%path' has to start with a slash.", ['%path' => $edit['site_404']]));
+    $this->assertRaw(new FormattableMarkup("The path '%path' has to start with a slash.", ['%path' => $edit['site_404']]));
 
     // Use a custom 404 page.
     $edit = [