refactor: use toBeBetween instead toBeGreaterThanOrEqual and toBeLessThanOrEqual (#20)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: enisdenjo

implementations/thegraph/README.md

@@ -32,7 +32,7 @@ Status code 404 is not 200
 ```
 4. MAY NOT allow executing mutations on GET requests<br />
 ```
-Status code 200 is not greater than or equal to 400
+Status code 200 is not between 400 and 499
 ```
 5. SHOULD use 400 status code on missing {query} parameter when accepting application/graphql-response+json<br />
 ```

src/audits/server.ts

@@ -211,8 +211,7 @@ export function serverAudits(opts: ServerAuditOptions): Audit[] {
           accept: 'application/graphql-response+json',
         },
       });
-      assert('Status code', res.status).toBeGreaterThanOrEqual(400);
-      assert('Status code', res.status).toBeLessThanOrEqual(499);
+      assert('Status code', res.status).toBeBetween(400, 499);
     }),
     // Request POST
     audit(
@@ -221,8 +220,7 @@ export function serverAudits(opts: ServerAuditOptions): Audit[] {
         const res = await fetchFn(opts.url, {
           method: 'POST',
         });
-        assert('Status code', res.status).toBeGreaterThanOrEqual(400);
-        assert('Status code', res.status).toBeLessThanOrEqual(499);
+        assert('Status code', res.status).toBeBetween(400, 499);
       },
     ),
     audit('MUST accept application/json POST requests', async () => {
@@ -731,8 +729,7 @@ export function serverAudits(opts: ServerAuditOptions): Audit[] {
           },
           body: '{ "not a JSON',
         });
-        assert('Status code', res.status).toBeGreaterThanOrEqual(400);
-        assert('Status code', res.status).toBeLessThanOrEqual(599);
+        assert('Status code', res.status).toBeBetween(400, 499);
       },
     ),
     audit(
@@ -780,8 +777,7 @@ export function serverAudits(opts: ServerAuditOptions): Audit[] {
             qeury /* typo */: '{ __typename }',
           }),
         });
-        assert('Status code', res.status).toBeGreaterThanOrEqual(400);
-        assert('Status code', res.status).toBeLessThanOrEqual(599);
+        assert('Status code', res.status).toBeBetween(400, 599);
       },
     ),
     audit(
@@ -833,8 +829,7 @@ export function serverAudits(opts: ServerAuditOptions): Audit[] {
             query: '{',
           }),
         });
-        assert('Status code', res.status).toBeGreaterThanOrEqual(400);
-        assert('Status code', res.status).toBeLessThanOrEqual(599);
+        assert('Status code', res.status).toBeBetween(400, 599);
       },
     ),
     audit(
@@ -886,8 +881,7 @@ export function serverAudits(opts: ServerAuditOptions): Audit[] {
             query: '{ 8f31403dfe404bccbb0e835f2629c6a7 }', // making sure the field doesnt exist
           }),
         });
-        assert('Status code', res.status).toBeGreaterThanOrEqual(400);
-        assert('Status code', res.status).toBeLessThanOrEqual(599);
+        assert('Status code', res.status).toBeBetween(400, 599);
       },
     ),
     audit(

src/audits/utils.ts

@@ -57,14 +57,12 @@ export function assert<T = unknown>(name: string, actual: T) {
         throw `${name} ${actual} is not ${expected}`;
       }
     },
-    toBeLessThanOrEqual: (expected: T extends number ? T : never) => {
-      if (!(actual <= expected)) {
-        throw `${name} ${actual} is not less than or equal to ${expected}`;
-      }
-    },
-    toBeGreaterThanOrEqual: (expected: T extends number ? T : never) => {
-      if (!(actual >= expected)) {
-        throw `${name} ${actual} is not greater than or equal to ${expected}`;
+    toBeBetween: (
+      min: T extends number ? T : never,
+      max: T extends number ? T : never,
+    ) => {
+      if (!(min <= actual && actual <= max)) {
+        throw `${name} ${actual} is not between ${min} and ${max}`;
       }
     },
     toContain: (