Remove old test

putyourlightson · Mar 30, 2024 · 30c19d2 · 30c19d2
1 parent 249f6a7
commit 30c19d2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/src/services/CacheRequestService.php b/src/services/CacheRequestService.php
@@ -450,10 +450,10 @@ public function getCachedResponse(SiteUriModel $siteUri): ?Response
 
         $cacheStorage = Blitz::$plugin->cacheStorage;
         $siteUri = $event->siteUri;
-        $encoded = $this->requestAcceptsEncoding();
+        $encoded = $this->requestAcceptsEncoding() && $cacheStorage->canCompressCachedValues();
         $content = '';
 
-        if ($encoded && $cacheStorage->canCompressCachedValues()) {
+        if ($encoded) {
             $content = $cacheStorage->getCompressed($siteUri);
         }
 

diff --git a/tests/TESTS.md b/tests/TESTS.md
@@ -18,4 +18,3 @@ _Tests that cached web responses contain the correct headers and comments._
 ![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Response does not contain output comments when disabled.  
 ![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Response with mime type has headers and does not contain output comments.  
 ![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Response is encoded when compression is enabled.  
-![Pass](https://raw.githubusercontent.com/putyourlightson/craft-generate-test-spec/main/icons/pass.svg) Response is not encoded when compression is disabled.  
diff --git a/tests/pest/Interface/WebResponseTest.php b/tests/pest/Interface/WebResponseTest.php
@@ -97,6 +97,7 @@
     $siteUri = createSiteUri();
     Blitz::$plugin->cacheStorage->compressCachedValues = true;
     Blitz::$plugin->cacheStorage->save($output, $siteUri);
+    Craft::$app->getRequest()->headers->remove(HeaderEnum::ACCEPT_ENCODING);
     Craft::$app->getRequest()->headers->set(HeaderEnum::ACCEPT_ENCODING, 'deflate, gzip');
     $response = Blitz::$plugin->cacheRequest->getCachedResponse($siteUri);
 
@@ -105,17 +106,3 @@
         ->and(gzdecode($response->content))
         ->toBe($output);
 });
-
-test('Response is not encoded when compression is disabled', function() {
-    $output = createOutput();
-    $siteUri = createSiteUri();
-    Blitz::$plugin->cacheStorage->compressCachedValues = false;
-    Blitz::$plugin->cacheStorage->save($output, $siteUri);
-    Craft::$app->getRequest()->headers->set(HeaderEnum::ACCEPT_ENCODING, 'deflate, gzip');
-    $response = Blitz::$plugin->cacheRequest->getCachedResponse($siteUri);
-
-    expect($response->headers->get(HeaderEnum::CONTENT_ENCODING))
-        ->toBeNull()
-        ->and($response->content)
-        ->toContain($output);
-});