Add handler tests

inpsyde · Jul 29, 2024 · ad7026e · ad7026e
1 parent 985ac96
commit ad7026e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/src/AssetManager.php b/src/AssetManager.php
@@ -328,6 +328,6 @@ private function ensureSetup(): void
 
     public function ignoreCache(): void
     {
-        $this->ignoreCacheHandler->execute($this);
+        $this->ignoreCacheHandler->run($this);
     }
 }
diff --git a/src/Caching/IgnoreCacheHandler.php b/src/Caching/IgnoreCacheHandler.php
@@ -10,7 +10,7 @@
 
 class IgnoreCacheHandler
 {
-    public function execute(AssetManager $assetManager): void
+    public function run(AssetManager $assetManager): bool
     {
         /** @var IgnorePluginCacheInterface[] $handlers */
         $handlers = [
@@ -24,14 +24,15 @@ public function execute(AssetManager $assetManager): void
             count($assetHandles[Script::class]) === 0 &&
             count($assetHandles[Style::class]) === 0
         ) {
-            return;
+            return false;
         }
 
         foreach ($handlers as $ignorePluginHandler) {
             if ($ignorePluginHandler->isInstalled()) {
                 $ignorePluginHandler->apply($assetHandles);
             }
         }
+        return true;
     }
 
     protected function extractHandles(AssetManager $assetManager): array

diff --git a/tests/phpunit/Unit/Caching/IgnoreCacheHandlerTest.php b/tests/phpunit/Unit/Caching/IgnoreCacheHandlerTest.php
@@ -22,8 +22,6 @@
 use Inpsyde\Assets\Util\AssetHookResolver;
 use Inpsyde\WpContext;
 
-use function PHPUnit\Framework\assertSame;
-
 class IgnoreCacheHandlerTest extends AbstractTestCase
 {
     /**
@@ -36,6 +34,19 @@ protected function setUp(): void
         Functions\when('wp_styles')->justReturn(\Mockery::mock('WP_Styles'));
     }
 
+    public function testRun(): void
+    {
+        $ignoreCacheHandler = new IgnoreCacheHandler();
+        $assetsManagerNoScripts = $this->factoryAssetManager();
+        $assetsManagerWithScripts = $this->factoryAssetManager();
+        $assetsManagerWithScripts->register(
+            new Script('example-1', 'script1.js')
+        );
+
+        static::assertFalse($ignoreCacheHandler->run($assetsManagerNoScripts));
+        static::assertTrue($ignoreCacheHandler->run($assetsManagerWithScripts));
+    }
+
     public function testExtractHandles(): void
     {
         $assetsManager = $this->factoryAssetManager();

diff --git a/tests/phpunit/Unit/Caching/IgnoreSitegroundCacheTest.php b/tests/phpunit/Unit/Caching/IgnoreSitegroundCacheTest.php
@@ -16,11 +16,11 @@
 use Inpsyde\Assets\Caching\IgnoreSitegroundCache;
 use Inpsyde\Assets\Tests\Unit\AbstractTestCase;
 
-use function PHPUnit\Framework\assertSame;
-
 class IgnoreSitegroundCacheTest extends AbstractTestCase
 {
-    public function testIsInstalled()
+    // phpcs:disable Squiz.PHP.Eval.Discouraged
+    // phpcs:disable Inpsyde.CodeQuality.VariablesName.SnakeCaseVar
+    public function testIsInstalled(): void
     {
         if (!class_exists('SiteGround_Optimizer\Loader\Loader')) {
             eval('namespace SiteGround_Optimizer\Loader { class Loader {} }');

diff --git a/tests/phpunit/Unit/Caching/IgnoreW3TotalCacheTest.php b/tests/phpunit/Unit/Caching/IgnoreW3TotalCacheTest.php
@@ -13,14 +13,13 @@
 
 namespace Inpsyde\Assets\Tests\Unit\Caching;
 
-use Inpsyde\Assets\Caching\IgnoreSitegroundCache;
 use Inpsyde\Assets\Caching\IgnoreW3TotalCache;
 use Inpsyde\Assets\Tests\Unit\AbstractTestCase;
 
-use function PHPUnit\Framework\assertSame;
-
 class IgnoreW3TotalCacheTest extends AbstractTestCase
 {
+    // phpcs:disable Squiz.PHP.Eval.Discouraged
+    // phpcs:disable Inpsyde.CodeQuality.VariablesName.SnakeCaseVar
     public function testIsInstalled(): void
     {
         if (!class_exists('W3TC\Root_Loader')) {
@@ -30,6 +29,7 @@ public function testIsInstalled(): void
         $IgnoreW3TotalCache = new IgnoreW3TotalCache();
         $this->assertTrue($IgnoreW3TotalCache->isInstalled());
     }
+
     public function testApply(): void
     {