Improve and add tests for Last-Modified computation with ESI responses

mpdude · mpdude · commit 40d54559c0f1 · 2024-08-14T17:08:10.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/ResponseCacheStrategyTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/ResponseCacheStrategyTest.php
@@ -138,22 +138,48 @@ public function testLastModifiedIsMergedWithEmbeddedResponse()
     {
         $cacheStrategy = new ResponseCacheStrategy();
 
+        $mainResponse = new Response();
+        $mainResponse->setLastModified(new \DateTimeImmutable('-2 hour'));
+
         $embeddedDate = new \DateTimeImmutable('-1 hour');
+        $embeddedResponse = new Response();
+        $embeddedResponse->setLastModified($embeddedDate);
 
-        // This master response uses the "validation" model
-        $masterResponse = new Response();
-        $masterResponse->setLastModified(new \DateTimeImmutable('-2 hour'));
-        $masterResponse->setEtag('foo');
+        $cacheStrategy->add($embeddedResponse);
+        $cacheStrategy->update($mainResponse);
+
+        $this->assertTrue($mainResponse->headers->has('Last-Modified'));
+        $this->assertSame($embeddedDate->getTimestamp(), $mainResponse->getLastModified()->getTimestamp());
+    }
+
+    public function testLastModifiedIsRemovedWhenEmbeddedResponseHasNoLastModified()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $mainResponse = new Response();
+        $mainResponse->setLastModified(new \DateTimeImmutable('-2 hour'));
 
-        // Embedded response uses "expiry" model
         $embeddedResponse = new Response();
-        $embeddedResponse->setLastModified($embeddedDate);
+
         $cacheStrategy->add($embeddedResponse);
+        $cacheStrategy->update($mainResponse);
+
+        $this->assertFalse($mainResponse->headers->has('Last-Modified'));
+    }
 
-        $cacheStrategy->update($masterResponse);
+    public function testLastModifiedIsNotAddedWhenMainResponseHasNoLastModified()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
 
-        $this->assertTrue($masterResponse->isValidateable());
-        $this->assertSame($embeddedDate->getTimestamp(), $masterResponse->getLastModified()->getTimestamp());
+        $mainResponse = new Response();
+
+        $embeddedResponse = new Response();
+        $embeddedResponse->setLastModified(new \DateTimeImmutable('-2 hour'));
+
+        $cacheStrategy->add($embeddedResponse);
+        $cacheStrategy->update($mainResponse);
+
+        $this->assertFalse($mainResponse->headers->has('Last-Modified'));
     }
 
     public function testMainResponseIsNotCacheableWhenEmbeddedResponseIsNotCacheable()
