From 2a0cfe5d7630388d0384d0667c53e5a600104e7a Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 17 Aug 2022 17:37:04 +0900
Subject: [PATCH] =?UTF-8?q?Issue=20#3303787=20by=20andypost,=20ravi.shanka?=
=?UTF-8?q?r,=20longwave,=20G=C3=A1bor=20Hojtsy:=20Move=20core/modules/hel?=
=?UTF-8?q?p=5Ftopics/config/optional/block.block.seven=5Fhelp=5Fsearch.ym?=
=?UTF-8?q?l=20to=20Seven?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../KernelTests/Config/DefaultConfigTest.php | 20 ++++++++++---------
.../block.block.seven_help_search.yml | 2 ++
2 files changed, 13 insertions(+), 9 deletions(-)
rename core/{modules/help_topics => themes/seven}/config/optional/block.block.seven_help_search.yml (93%)
diff --git a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
index 9bbfd93f648c..7ec6db6952dc 100644
--- a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
+++ b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
@@ -126,11 +126,11 @@ protected function assertExtensionConfig(string $name, string $type): void {
$this->container->get('module_installer')->install($modules_to_install);
$this->container->get('theme_installer')->install(array_unique($themes_to_install));
- // Test configuration in the module's config/install directory.
- $this->doTestsOnConfigStorage($extension_config_storage, $name);
+ // Test configuration in the extension's config/install directory.
+ $this->doTestsOnConfigStorage($extension_config_storage, $name, $type);
- // Test configuration in the module's config/optional directory.
- $this->doTestsOnConfigStorage($optional_config_storage, $name);
+ // Test configuration in the extension's config/optional directory.
+ $this->doTestsOnConfigStorage($optional_config_storage, $name, $type);
}
/**
@@ -184,10 +184,12 @@ public function moduleListDataProvider() {
*
* @param \Drupal\Core\Config\StorageInterface $default_config_storage
* The default config storage to test.
- * @param string $module
- * The module that is being tested.
+ * @param string $extension
+ * 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 */
$config_manager = $this->container->get('config.manager');
@@ -229,9 +231,9 @@ protected function doTestsOnConfigStorage(StorageInterface $default_config_stora
// and needs its own test.
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) {
- $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");
}
}
}
diff --git a/core/modules/help_topics/config/optional/block.block.seven_help_search.yml b/core/themes/seven/config/optional/block.block.seven_help_search.yml
similarity index 93%
rename from core/modules/help_topics/config/optional/block.block.seven_help_search.yml
rename to core/themes/seven/config/optional/block.block.seven_help_search.yml
index 6d93b8f8b85d..912264d1fb81 100644
--- a/core/modules/help_topics/config/optional/block.block.seven_help_search.yml
+++ b/core/themes/seven/config/optional/block.block.seven_help_search.yml
@@ -9,6 +9,8 @@ dependencies:
enforced:
config:
- search.page.help_search
+ module:
+ - help_topics
id: seven_help_search
theme: seven
region: help
--
GitLab