Commit 2a0cfe5d authored by catch's avatar catch
Browse files

Issue #3303787 by andypost, ravi.shankar, longwave, Gábor Hojtsy: Move... 

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
parent 2ac364c3

core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php

+11 −9
Original line number Diff line number Diff line
@@ -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");

        }

      }

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ dependencies: 
  enforced:

    config:

      - search.page.help_search

    module:

      - help_topics

id: seven_help_search

theme: seven

region: help