From 30fa29fc655e4519efe279a9a15960472c64c339 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Thu, 30 Sep 2021 18:32:33 +0200
Subject: [PATCH] [HttpKernel] Relax some transient tests

---
 .../Tests/Fragment/FragmentHandlerTest.php     | 18 ++++++++++++++----
 .../Fragment/InlineFragmentRendererTest.php    |  9 +++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
index 7ad4f3e704a5a..b4919db611f73 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -18,9 +18,6 @@
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 use Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface;
 
-/**
- * @group time-sensitive
- */
 class FragmentHandlerTest extends TestCase
 {
     private $requestStack;
@@ -61,7 +58,20 @@ public function testDeliverWithUnsuccessfulResponse()
 
     public function testRender()
     {
-        $handler = $this->getHandler($this->returnValue(new Response('foo')), ['/', Request::create('/'), ['foo' => 'foo', 'ignore_errors' => true]]);
+        $expectedRequest = Request::create('/');
+        $handler = $this->getHandler(
+            $this->returnValue(new Response('foo')),
+            [
+                '/',
+                $this->callback(function (Request $request) use ($expectedRequest) {
+                    $expectedRequest->server->remove('REQUEST_TIME_FLOAT');
+                    $request->server->remove('REQUEST_TIME_FLOAT');
+
+                    return $expectedRequest == $request;
+                }),
+                ['foo' => 'foo', 'ignore_errors' => true],
+            ]
+        );
 
         $this->assertEquals('foo', $handler->render('/', 'foo', ['foo' => 'foo']));
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
index acd9df73753af..c22a426d7d31e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -261,13 +261,18 @@ public function testIpAddressOfRangedTrustedProxyIsSetAsRemote()
     /**
      * Creates a Kernel expecting a request equals to $request.
      */
-    private function getKernelExpectingRequest(Request $request, $strict = false)
+    private function getKernelExpectingRequest(Request $expectedRequest)
     {
         $kernel = $this->createMock(HttpKernelInterface::class);
         $kernel
             ->expects($this->once())
             ->method('handle')
-            ->with($request)
+            ->with($this->callback(function (Request $request) use ($expectedRequest) {
+                $expectedRequest->server->remove('REQUEST_TIME_FLOAT');
+                $request->server->remove('REQUEST_TIME_FLOAT');
+
+                return $expectedRequest == $request;
+            }))
             ->willReturn(new Response('foo'));
 
         return $kernel;