Move test in unit one

MatTheCat · MatTheCat · commit 9cc17e52c40a · 2022-08-17T18:02:57.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php
@@ -124,7 +124,6 @@ public function testLoginThrottling()
             ['johannes', 'also_wrong'],
             ['wrong', 'wrong'],
             ['johannes', 'wrong_again'],
-            ['johannes', 'still_wrong'],
         ];
         foreach ($attempts as $i => $attempt) {
             $form = $client->request('GET', '/login')->selectButton('login')->form();
@@ -138,21 +137,17 @@ public function testLoginThrottling()
                     $this->assertStringContainsString('Invalid credentials', $text, 'Invalid response on 1st attempt');
 
                     break;
-                case 1: // Second attempt : login throttling!
+                case 1: // Second attempt : login throttling !
                     $this->assertStringContainsString('Too many failed login attempts, please try again in 8 minutes.', $text, 'Invalid response on 2nd attempt');
 
                     break;
                 case 2: // Third attempt with unexisting username
                     $this->assertStringContainsString('Invalid credentials.', $text, 'Invalid response on 3rd attempt');
 
                     break;
-                case 3: // Fourth attempt : still login throttling!
+                case 3: // Fourth attempt : still login throttling !
                     $this->assertStringContainsString('Too many failed login attempts, please try again in 8 minutes.', $text, 'Invalid response on 4th attempt');
 
-                    break;
-                case 4: // Fifth attempt : still login throttling!
-                    $this->assertStringContainsString('Too many failed login attempts, please try again in 8 minutes.', $text, 'Invalid response on 5th attempt');
-
                     break;
             }
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RateLimiter/AbstractRequestRateLimiterTest.php b/src/Symfony/Component/HttpFoundation/Tests/RateLimiter/AbstractRequestRateLimiterTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\RateLimiter;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\RateLimiter\LimiterInterface;
+use Symfony\Component\RateLimiter\RateLimit;
+
+class AbstractRequestRateLimiterTest extends TestCase
+{
+    /**
+     * @dataProvider provideRateLimits
+     */
+    public function testConsume(array $rateLimits, ?RateLimit $expected)
+    {
+        $rateLimiter = new MockAbstractRequestRateLimiter(array_map(function (RateLimit $rateLimit) {
+            $limiter = $this->createStub(LimiterInterface::class);
+            $limiter->method('consume')->willReturn($rateLimit);
+
+            return $limiter;
+        }, $rateLimits));
+
+        $this->assertSame($expected, $rateLimiter->consume(new Request()));
+    }
+
+    public function provideRateLimits()
+    {
+        $now = new \DateTimeImmutable();
+
+        yield 'Both accepted with different count of remaining tokens' => [
+            [
+                $expected = new RateLimit(0, $now, true, 1), // less remaining tokens
+                new RateLimit(1, $now, true, 1),
+            ],
+            $expected,
+        ];
+
+        yield 'Both accepted with same count of remaining tokens' => [
+            [
+                $expected = new RateLimit(0, $now->add(new \DateInterval('P1D')), true, 1), // longest wait time
+                new RateLimit(0, $now, true, 1),
+            ],
+            $expected,
+        ];
+
+        yield 'Accepted and denied' => [
+            [
+                new RateLimit(0, $now, true, 1),
+                $expected = new RateLimit(0, $now, false, 1), // denied
+            ],
+            $expected,
+        ];
+    }
+}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RateLimiter/MockAbstractRequestRateLimiter.php b/src/Symfony/Component/HttpFoundation/Tests/RateLimiter/MockAbstractRequestRateLimiter.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\RateLimiter;
+
+use Symfony\Component\HttpFoundation\RateLimiter\AbstractRequestRateLimiter;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\RateLimiter\LimiterInterface;
+
+class MockAbstractRequestRateLimiter extends AbstractRequestRateLimiter
+{
+    /**
+     * @var LimiterInterface[]
+     */
+    private $limiters;
+
+    public function __construct(array $limiters)
+    {
+        $this->limiters = $limiters;
+    }
+
+    protected function getLimiters(Request $request): array
+    {
+        return $this->limiters;
+    }
+}
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
@@ -27,7 +27,8 @@
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
         "symfony/mime": "^4.4|^5.0|^6.0",
-        "symfony/expression-language": "^4.4|^5.0|^6.0"
+        "symfony/expression-language": "^4.4|^5.0|^6.0",
+        "symfony/rate-limiter": "^5.2|^6.0"
     },
     "suggest" : {
         "symfony/mime": "To use the file extension guesser"
