test(e2e): correct expectations & assertions (#542)

NeuraLegion · Apr 18, 2024 · 9fa11cd · 9fa11cd
1 parent 4d07181
commit 9fa11cd
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 52 deletions.
diff --git a/tests/Commands/repeater.spec.ts b/tests/Commands/repeater.spec.ts
@@ -117,9 +117,13 @@ describe('Repeater Command', () => {
         });
 
       // assert
-      await expect(act).rejects.toThrow(
-        '429 - "The repeater used for the scan is not connected. Connect the repeater and restart the scan."'
-      );
+      await expect(act).rejects.toThrow('Request failed with status code 429');
+      await expect(act).rejects.toMatchObject({
+        response: {
+          status: 429,
+          data: 'The repeater used for the scan is not connected. Connect the repeater and restart the scan.'
+        }
+      });
     }, 10000);
   });
 

diff --git a/tests/Setup/api.ts b/tests/Setup/api.ts
@@ -1,4 +1,5 @@
 import axios, { Axios } from 'axios';
+import { setTimeout } from 'node:timers/promises';
 
 export interface ApiOptions {
   baseUrl: string;
@@ -30,56 +31,54 @@ export class Api {
       headers: { authorization: `api-key ${options.apiKey}` }
     });
 
-    this.client.interceptors.request.use((request) => {
-      // eslint-disable-next-line no-console
-      console.log('Request:', {
-        method: request.method,
-        url: request.url,
-        headers: request.headers,
-        body: request.data
-      });
-
-      return request;
-    });
+    const isGithubRunnerDebugMode =
+      process.env.ACTIONS_STEP_DEBUG === 'true' ||
+      process.env.ACTIONS_RUNNER_DEBUG === 'true';
 
-    this.client.interceptors.response.use(
-      (response) => {
+    if (isGithubRunnerDebugMode) {
+      this.client.interceptors.request.use((request) => {
         // eslint-disable-next-line no-console
-        console.log('Response:', {
-          status: response.status,
-          statusText: response.statusText,
-          headers: response.headers,
-          body: response.data
+        console.log('Request:', {
+          method: request.method,
+          url: request.url,
+          headers: request.headers,
+          body: request.data
         });
 
-        return response;
-      },
-      (error) => {
-        if (axios.isAxiosError(error)) {
-          if (error.response) {
+        return request;
+      });
+
+      this.client.interceptors.response.use(
+        (response) => {
+          // eslint-disable-next-line no-console
+          console.log('Response:', {
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+            body: response.data
+          });
+
+          return response;
+        },
+        (error) => {
+          if (axios.isAxiosError(error)) {
+            if (error.response) {
+              // eslint-disable-next-line no-console
+              console.log('Response:', {
+                status: error.response.status,
+                statusText: error.response.statusText,
+                headers: error.response.headers,
+                body: error.response.data
+              });
+            }
+          } else {
             // eslint-disable-next-line no-console
-            console.log('Response:', {
-              status: error.response.status,
-              statusText: error.response.statusText,
-              headers: error.response.headers,
-              body: error.response.data
-            });
+            console.log('Response Error:', error);
           }
-        } else {
-          // eslint-disable-next-line no-console
-          console.log('Response Error:', error);
-        }
 
-        return Promise.reject(error);
-      }
-    );
-
-    const isGithubRunnerDebugMode =
-      process.env.ACTIONS_STEP_DEBUG === 'true' ||
-      process.env.ACTIONS_RUNNER_DEBUG === 'true';
-
-    if (!isGithubRunnerDebugMode) {
-      this.client.interceptors.request.clear();
+          return Promise.reject(error);
+        }
+      );
     }
   }
 
@@ -136,7 +135,7 @@ export class Api {
           `Repeater ${repeaterId} is not connected after ${maxAttempts} checks`
         );
       } else {
-        await this.sleep(timeout);
+        await setTimeout(timeout);
       }
     }
   }
@@ -162,12 +161,8 @@ export class Api {
           `Scan ${scanId} couldn't finish after ${maxAttempts} checks`
         );
       } else {
-        await this.sleep(timeout);
+        await setTimeout(timeout);
       }
     }
   }
-
-  private async sleep(time: number) {
-    return new Promise((resolve) => setTimeout(resolve, time));
-  }
 }