From f4c6a21986314803675e525c17ef5cbfd1eab8e8 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 25 Sep 2016 09:48:41 +0100
Subject: [PATCH] Issue #2805757 by Mile23: InstallerRedirectTraitTest causes
 fatal when run from PHPUnit

---
 .../Core/Installer/InstallerRedirectTraitTest.php      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
 rename core/tests/Drupal/{Tests => KernelTests}/Core/Installer/InstallerRedirectTraitTest.php (93%)

diff --git a/core/tests/Drupal/Tests/Core/Installer/InstallerRedirectTraitTest.php b/core/tests/Drupal/KernelTests/Core/Installer/InstallerRedirectTraitTest.php
similarity index 93%
rename from core/tests/Drupal/Tests/Core/Installer/InstallerRedirectTraitTest.php
rename to core/tests/Drupal/KernelTests/Core/Installer/InstallerRedirectTraitTest.php
index 8ca55d28eae..fea860973bc 100644
--- a/core/tests/Drupal/Tests/Core/Installer/InstallerRedirectTraitTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Installer/InstallerRedirectTraitTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Installer;
+namespace Drupal\KernelTests\Core\Installer;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\Database;
@@ -8,19 +8,15 @@ use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Database\DatabaseNotFoundException;
 use Drupal\Core\Database\Schema;
 use Drupal\Core\Installer\InstallerRedirectTrait;
-use Drupal\Tests\UnitTestCase;
+use Drupal\KernelTests\KernelTestBase;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-// The function drupal_installation_attempted() has to be included.
-$root = dirname(dirname(dirname(dirname(dirname(dirname(__DIR__))))));
-require_once $root . '/core/includes/bootstrap.inc';
-
 /**
  * @coversDefaultClass \Drupal\Core\Installer\InstallerRedirectTrait
  *
  * @group Installer
  */
-class InstallerRedirectTraitTest extends UnitTestCase {
+class InstallerRedirectTraitTest extends KernelTestBase {
 
   /**
    * Data provider for testShouldRedirectToInstaller().