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

Issue #3303787 by andypost, ravi.shankar, longwave, Gábor Hojtsy: Move core/modules/help_topics/config/optional/block.block.seven_help_search.yml to Seven

merge-requests/2541/merge
catch 2022-08-17 17:37:04 +09:00
parent 2ac364c313
commit 2a0cfe5d76
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
View File

@ -126,11 +126,11 @@ class DefaultConfigTest extends KernelTestBase {
$this->container->get('module_installer')->install($modules_to_install); $this->container->get('module_installer')->install($modules_to_install);
$this->container->get('theme_installer')->install(array_unique($themes_to_install)); $this->container->get('theme_installer')->install(array_unique($themes_to_install));
// Test configuration in the module's config/install directory. // Test configuration in the extension's config/install directory.
$this->doTestsOnConfigStorage($extension_config_storage, $name); $this->doTestsOnConfigStorage($extension_config_storage, $name, $type);
// Test configuration in the module's config/optional directory. // Test configuration in the extension's config/optional directory.
$this->doTestsOnConfigStorage($optional_config_storage, $name); $this->doTestsOnConfigStorage($optional_config_storage, $name, $type);
} }
/** /**
@ -184,10 +184,12 @@ class DefaultConfigTest extends KernelTestBase {
* *
* @param \Drupal\Core\Config\StorageInterface $default_config_storage * @param \Drupal\Core\Config\StorageInterface $default_config_storage
* The default config storage to test. * The default config storage to test.
* @param string $module * @param string $extension
* The module that is being tested. * The extension that is being tested.
* @param string $type
* The extension type to test.
*/ */
protected function doTestsOnConfigStorage(StorageInterface $default_config_storage, $module) { protected function doTestsOnConfigStorage(StorageInterface $default_config_storage, $extension, string $type = 'module') {
/** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */ /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
$config_manager = $this->container->get('config.manager'); $config_manager = $this->container->get('config.manager');
@ -229,9 +231,9 @@ class DefaultConfigTest extends KernelTestBase {
// and needs its own test. // and needs its own test.
continue; continue;
} }
$info = $this->container->get('extension.list.module')->getExtensionInfo($module); $info = $this->container->get("extension.list.$type")->getExtensionInfo($extension);
if (!isset($info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER]) || $info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER] !== ExtensionLifecycle::EXPERIMENTAL) { if (!isset($info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER]) || $info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER] !== ExtensionLifecycle::EXPERIMENTAL) {
$this->fail("$config_name provided by $module does not exist after installing all dependencies"); $this->fail("$config_name provided by $extension does not exist after installing all dependencies");
} }
} }
} }

2
core/modules/help_topics/config/optional/block.block.seven_help_search.yml → core/themes/seven/config/optional/block.block.seven_help_search.yml
View File

@ -9,6 +9,8 @@ dependencies:
enforced: enforced:
config: config:
- search.page.help_search - search.page.help_search
module:
- help_topics
id: seven_help_search id: seven_help_search
theme: seven theme: seven
region: help region: help