Merge pull request #49 from swat-sccs/fix-integration-tests

Fix integration tests
swat-sccs · Oct 3, 2023 · 41ffef1 · 41ffef1
2 parents f7a69c9 + d57ec6b
commit 41ffef1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -7,7 +7,7 @@ on:
     branches: [master]
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
 
     steps:

diff --git a/src/util/rateLimits.ts b/src/util/rateLimits.ts
@@ -31,9 +31,12 @@ const postRateLimiter = new RateLimiterMemory({
 
 export const limitRequestRate: RequestHandler = catchErrors(async (req, res, next) => {
   try {
-    const limiter = req.method == 'GET' ? requestRateLimiter : postRateLimiter;
-    const limiterRes = await limiter.consume(req.ip);
-    setRateLimitHeaders(limiterRes, res);
+    // don't ratelimit login because it breaks integration tests and it has its own ratelimiters
+    if (req.path !== '/login') {
+      const limiter = req.method == 'GET' ? requestRateLimiter : postRateLimiter;
+      const limiterRes = await limiter.consume(req.ip);
+      setRateLimitHeaders(limiterRes, res);
+    }
     next();
   } catch (e) {
     if (e instanceof Error) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ on: @@
         branches: [master]
     jobs:
-      build:
+      test:
         runs-on: ubuntu-latest
         steps:
@@ Expand Down @@