Fix tests

apitally · Jul 6, 2024 · fe0079d · fe0079d
1 parent 77fb5a7
commit fe0079d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -192,7 +192,7 @@
     "koa": "^2.14.2",
     "koa-bodyparser": "^4.4.1",
     "koa-route": "^4.0.0",
-    "nock": "^13.3.8",
+    "nock": "^14.0.0-beta.7",
     "npm": "^10.2.4",
     "prettier": "^3.1.0",
     "supertest": "^7.0.0",

diff --git a/src/common/client.ts b/src/common/client.ts
@@ -17,12 +17,6 @@ const INITIAL_SYNC_INTERVAL = 10000; // 10 seconds
 const INITIAL_SYNC_INTERVAL_DURATION = 3600000; // 1 hour
 const MAX_QUEUE_TIME = 3.6e6; // 1 hour
 
-const fetchWithRetry = fetchRetry(fetch, {
-  retries: 3,
-  retryDelay: 1000,
-  retryOn: [408, 429, 500, 502, 503, 504],
-});
-
 class HTTPError extends Error {
   public response: Response;
 
@@ -107,6 +101,11 @@ export class ApitallyClient {
   }
 
   private async makeHubRequest(url: string, payload: any) {
+    const fetchWithRetry = fetchRetry(fetch, {
+      retries: 3,
+      retryDelay: 1000,
+      retryOn: [408, 429, 500, 502, 503, 504],
+    });
     const response = await fetchWithRetry(this.getHubUrlPrefix() + url, {
       method: "POST",
       body: JSON.stringify(payload),

diff --git a/tests/express/app.test.ts b/tests/express/app.test.ts
@@ -20,7 +20,7 @@ const testCases = [
 testCases.forEach(({ name, getApp }) => {
   describe(name, () => {
     let app: Express;
-    let appTest: request.SuperTest<request.Test>;
+    let appTest: request.Agent;
     let client: ApitallyClient;
 
     beforeEach(async () => {

diff --git a/tests/fastify/app.test.ts b/tests/fastify/app.test.ts
@@ -8,13 +8,12 @@ import { getApp } from "./app.js";
 
 describe("Plugin for Fastify", () => {
   let app: FastifyInstance;
-  let appTest: request.SuperTest<request.Test>;
+  let appTest: request.Agent;
   let client: ApitallyClient;
 
   beforeEach(async () => {
     mockApitallyHub();
     app = await getApp();
-    app.printRoutes;
     appTest = request(app.server);
     client = ApitallyClient.getInstance();
     await app.ready();

diff --git a/tests/koa/app.test.ts b/tests/koa/app.test.ts
@@ -23,7 +23,7 @@ const testCases = [
 testCases.forEach(({ name, router, getApp }) => {
   describe(name, () => {
     let app: Koa;
-    let appTest: request.SuperTest<request.Test>;
+    let appTest: request.Agent;
     let client: ApitallyClient;
 
     beforeEach(async () => {

diff --git a/tests/nestjs/app.test.ts b/tests/nestjs/app.test.ts
@@ -9,7 +9,7 @@ import { getApp } from "./app.js";
 
 describe("Middleware for NestJS", () => {
   let app: INestApplication;
-  let appTest: request.SuperTest<request.Test>;
+  let appTest: request.Agent;
   let client: ApitallyClient;
 
   beforeEach(async () => {