diff --git a/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php b/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php index 58fda4cf9e8..833b0d3b1ae 100644 --- a/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php +++ b/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php @@ -7,7 +7,7 @@ namespace Drupal\Tests\update\Functional; * * @group update */ -class FileTransferAuthorizeFormTest extends UpdateTestBase { +class FileTransferAuthorizeFormTest extends UpdateUploaderTestBase { /** * Modules to enable. diff --git a/core/modules/update/tests/src/Functional/UpdateTestBase.php b/core/modules/update/tests/src/Functional/UpdateTestBase.php index 3ce55483173..8ab357424c6 100644 --- a/core/modules/update/tests/src/Functional/UpdateTestBase.php +++ b/core/modules/update/tests/src/Functional/UpdateTestBase.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\update\Functional; -use Drupal\Core\DrupalKernel; use Drupal\Core\Url; use Drupal\Tests\BrowserTestBase; @@ -54,28 +53,6 @@ abstract class UpdateTestBase extends BrowserTestBase { */ protected $updateProject; - protected function setUp() { - parent::setUp(); - - // Change the root path which Update Manager uses to install and update - // projects to be inside the testing site directory. See - // \Drupal\update\UpdateRootFactory::get() for equivalent changes to the - // test child site. - $request = \Drupal::request(); - $update_root = $this->container->get('update.root') . '/' . DrupalKernel::findSitePath($request); - $this->container->get('update.root')->set($update_root); - - // Create the directories within the root path within which the Update - // Manager will install projects. - foreach (drupal_get_updaters() as $updater_info) { - $updater = $updater_info['class']; - $install_directory = $update_root . '/' . $updater::getRootDirectoryRelativePath(); - if (!is_dir($install_directory)) { - mkdir($install_directory); - } - } - } - /** * Refreshes the update status based on the desired available update scenario. * diff --git a/core/modules/update/tests/src/Functional/UpdateUploadTest.php b/core/modules/update/tests/src/Functional/UpdateUploadTest.php index 4d447c17ead..c3212f5f563 100644 --- a/core/modules/update/tests/src/Functional/UpdateUploadTest.php +++ b/core/modules/update/tests/src/Functional/UpdateUploadTest.php @@ -12,7 +12,7 @@ use Drupal\Tests\TestFileCreationTrait; * * @group update */ -class UpdateUploadTest extends UpdateTestBase { +class UpdateUploadTest extends UpdateUploaderTestBase { use TestFileCreationTrait { getTestFiles as drupalGetTestFiles; diff --git a/core/modules/update/tests/src/Functional/UpdateUploaderTestBase.php b/core/modules/update/tests/src/Functional/UpdateUploaderTestBase.php new file mode 100644 index 00000000000..972495444d9 --- /dev/null +++ b/core/modules/update/tests/src/Functional/UpdateUploaderTestBase.php @@ -0,0 +1,37 @@ +container->get('update.root') . '/' . DrupalKernel::findSitePath($request); + $this->container->get('update.root')->set($update_root); + + // Create the directories within the root path within which the Update + // Manager will install projects. + foreach (drupal_get_updaters() as $updater_info) { + $updater = $updater_info['class']; + $install_directory = $update_root . '/' . $updater::getRootDirectoryRelativePath(); + if (!is_dir($install_directory)) { + mkdir($install_directory); + } + } + } + +}