Issue #39, #37 - Fixing tests to use ThemeSettingsProvider.

Author: zipymonkey

tests/src/Unit/Hook/ThemeHooksTest.php

@@ -4,8 +4,7 @@
 
 namespace Drupal\Tests\psulib_base_helper\Unit\Hook;
 
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Config\ImmutableConfig;
+use Drupal\Core\Extension\ThemeSettingsProvider;
 use Drupal\psulib_base_helper\Hook\ThemeHooks;
 use Drupal\psulib_base_helper\PsuFederatedDataFetcher;
 use Drupal\Tests\UnitTestCase;
@@ -29,18 +28,11 @@ class ThemeHooksTest extends UnitTestCase {
   protected $dataFetcher;
 
   /**
-   * The mocked config factory.
+   * The mocked theme settings provider.
    *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Extension\ThemeSettingsProvider|\PHPUnit\Framework\MockObject\MockObject
    */
-  protected $configFactory;
-
-  /**
-   * The mocked config.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig|\PHPUnit\Framework\MockObject\MockObject
-   */
-  protected $config;
+  protected $themeSettingsProvider;
 
   /**
    * The ThemeHooks instance.
@@ -56,16 +48,11 @@ protected function setUp(): void {
     parent::setUp();
 
     $this->dataFetcher = $this->createMock(PsuFederatedDataFetcher::class);
-    $this->configFactory = $this->createMock(ConfigFactoryInterface::class);
-    $this->config = $this->createMock(ImmutableConfig::class);
-
-    $this->configFactory->method('get')
-      ->with('psulib_base.settings')
-      ->willReturn($this->config);
+    $this->themeSettingsProvider = $this->createMock(ThemeSettingsProvider::class);
 
     $this->hooks = new ThemeHooks(
       $this->dataFetcher,
-      $this->configFactory
+      $this->themeSettingsProvider
     );
   }
 
@@ -74,7 +61,7 @@ protected function setUp(): void {
    */
   #[Test]
   public function testFederatedFooterAddedWhenSettingsAndDataPresent(): void {
-    $this->config->method('get')
+    $this->themeSettingsProvider->method('getSetting')
       ->with('show_federated_footer')
       ->willReturn(TRUE);
 
@@ -118,7 +105,7 @@ public function testFederatedFooterAddedWhenSettingsAndDataPresent(): void {
   #[Test]
   #[DataProvider('federatedFooterNotAddedProvider')]
   public function testFederatedFooterNotAddedWhenNoDataOrDisabled(?bool $showSetting, array $data, bool $expectFetcherCall): void {
-    $this->config->method('get')
+    $this->themeSettingsProvider->method('getSetting')
       ->with('show_federated_footer')
       ->willReturn($showSetting);