Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3440837 by sime: Test setup should copy default.settings.php/services.yml from assets

merge-requests/8121/head
catch 2024-05-20 12:44:51 +01:00
parent 02cc8841c5
commit f862f883cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
View File

@ -78,7 +78,7 @@ trait FunctionalTestSetupTrait {
// installation. // installation.
// Not using File API; a potential error must trigger a PHP warning. // Not using File API; a potential error must trigger a PHP warning.
$directory = DRUPAL_ROOT . '/' . $this->siteDirectory; $directory = DRUPAL_ROOT . '/' . $this->siteDirectory;
copy(DRUPAL_ROOT . '/sites/default/default.settings.php', $directory . '/settings.php'); copy(DRUPAL_ROOT . '/core/assets/scaffold/files/default.settings.php', $directory . '/settings.php');
// The public file system path is created during installation. Additionally, // The public file system path is created during installation. Additionally,
// during tests: // during tests:
@ -136,7 +136,7 @@ trait FunctionalTestSetupTrait {
$settings_services_file = DRUPAL_ROOT . '/' . $this->originalSite . '/testing.services.yml'; $settings_services_file = DRUPAL_ROOT . '/' . $this->originalSite . '/testing.services.yml';
if (!file_exists($settings_services_file)) { if (!file_exists($settings_services_file)) {
// Otherwise, use the default services as a starting point for overrides. // Otherwise, use the default services as a starting point for overrides.
$settings_services_file = DRUPAL_ROOT . '/sites/default/default.services.yml'; $settings_services_file = DRUPAL_ROOT . '/core/assets/scaffold/files/default.services.yml';
} }
// Put the testing-specific service overrides in place. // Put the testing-specific service overrides in place.