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

Issue #3245383 by Beakerboy, daffie: If the database driver is provided by a module, it's name must be included in tests which check for enabled modules

merge-requests/1560/merge
catch 2021-12-20 17:40:41 +00:00
parent 4b927a02fd
commit af2bc2f58e
5 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
View File

@ -26,7 +26,11 @@ class ModuleHandlerTest extends KernelTestBase {
*/
public function testModuleList() {
$module_list = ['system'];
$database_module = \Drupal::database()->getProvider();
if ($database_module !== 'core') {
$module_list[] = $database_module;
}
sort($module_list);
$this->assertModuleList($module_list, 'Initial');
// Try to install a new module.

4
core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
View File

@ -125,6 +125,10 @@ class ResolvedLibraryDefinitionsFilesMatchTest extends KernelTestBase {
$this->allModules[] = 'system';
$this->allModules[] = 'user';
$this->allModules[] = 'path_alias';
$database_module = \Drupal::database()->getProvider();
if ($database_module !== 'core') {
$this->allModules[] = $database_module;
}
sort($this->allModules);
$this->container->get('module_installer')->install($this->allModules);

19
core/tests/Drupal/KernelTests/Core/Common/DrupalFlushAllCachesTest.php
View File

@ -34,14 +34,29 @@ class DrupalFlushAllCachesTest extends KernelTestBase {
$core_extension->set('module', module_config_sort($module))->save();
$this->containerBuilds = 0;
drupal_flush_all_caches();
$this->assertSame(['system_test', 'system'], array_keys($this->container->getParameter('container.modules')));
$module_list = ['system_test', 'system'];
$database_module = \Drupal::database()->getProvider();
if ($database_module !== 'core') {
$module_list[] = $database_module;
}
sort($module_list);
$container_modules = array_keys($this->container->getParameter('container.modules'));
sort($container_modules);
$this->assertSame($module_list, $container_modules);
$this->assertSame(1, $this->containerBuilds);
$this->assertTrue(function_exists('system_test_help'));
$core_extension->clear('module.system_test')->save();
$this->containerBuilds = 0;
drupal_flush_all_caches();
$this->assertSame(['system'], array_keys($this->container->getParameter('container.modules')));
$module_list = ['system'];
if ($database_module !== 'core') {
$module_list[] = $database_module;
}
sort($module_list);
$container_modules = array_keys($this->container->getParameter('container.modules'));
sort($container_modules);
$this->assertSame($module_list, $container_modules);
$this->assertSame(1, $this->containerBuilds);
}

4
core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php
View File

@ -74,6 +74,10 @@ class Stable9LibraryOverrideTest extends KernelTestBase {
$this->allModules[] = 'system';
$this->allModules[] = 'user';
$this->allModules[] = 'path_alias';
$database_module = \Drupal::database()->getProvider();
if ($database_module !== 'core') {
$this->allModules[] = $database_module;
}
sort($this->allModules);
$this->container->get('module_installer')->install($this->allModules);

4
core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php
View File

@ -74,6 +74,10 @@ class StableLibraryOverrideTest extends KernelTestBase {
$this->allModules[] = 'system';
$this->allModules[] = 'user';
$this->allModules[] = 'path_alias';
$database_module = \Drupal::database()->getProvider();
if ($database_module !== 'core') {
$this->allModules[] = $database_module;
}
sort($this->allModules);
$this->container->get('module_installer')->install($this->allModules);