chore(oxlint): add import and vitest in plugins, update tests (#521)

Co-authored-by: Dmytro Donskov <donskovdmitriyv@gmail.com>

Author: TeoBonza

.oxlintrc.json

@@ -1,6 +1,6 @@
 {
   "$schema": "./node_modules/oxlint/configuration_schema.json",
-  "plugins": ["typescript", "unicorn", "oxc"],
+  "plugins": ["typescript", "unicorn", "oxc", "import", "vitest"],
   "categories": {
     "correctness": "error"
   },
@@ -30,6 +30,18 @@
         "no-unused-vars": "off",
         "unicorn/no-empty-file": "off"
       }
+    },
+    {
+      "files": ["test/NISTPKITS.spec.ts", "test/functionalTest.spec.ts"],
+      "rules": {
+        "vitest/expect-expect": "off"
+      }
+    },
+    {
+      "files": ["test/NISTPKITS.spec.ts", "test/nodePKCS12Example.spec.ts"],
+      "rules": {
+        "vitest/no-disabled-tests": "off"
+      }
     }
   ],
   "env": {

test/NISTPKITS.spec.ts

@@ -1895,7 +1895,7 @@ describe("PKITS's certificates parsing test", () => {
       };
     };
 
-    it(keys[i], runningFunction(pkitsToArrayBuffer(PKITS.certs[keys[i]]), parsingCheck));
+    it(`${keys[i]}`, runningFunction(pkitsToArrayBuffer(PKITS.certs[keys[i]]), parsingCheck));
   }
 });
 
@@ -1923,7 +1923,7 @@ describe("PKITS's CRL parsing test", () => {
       };
     };
 
-    it(keys[i], runningFunction(pkitsToArrayBuffer(PKITS.crls[keys[i]]), parsingCheck));
+    it(`${keys[i]}`, runningFunction(pkitsToArrayBuffer(PKITS.crls[keys[i]]), parsingCheck));
   }
 });
 
@@ -1972,7 +1972,7 @@ describe("PKITS's certificate pairs parsing test", () => {
       };
     };
 
-    it(keys[i], runningFunction(pkitsToArrayBuffer(PKITS.certpairs[keys[i]]), parsingCheck));
+    it(`${keys[i]}`, runningFunction(pkitsToArrayBuffer(PKITS.certpairs[keys[i]]), parsingCheck));
   }
 });
 

test/certificateComplexExample.spec.ts

@@ -27,9 +27,8 @@ describe("Certificate Complex Example", () => {
 
   signAlgs.forEach(signAlg => {
     hashAlgs.forEach(hashAlg => {
-      const testName = `${hashAlg} + ${signAlg}`;
-
-      it(testName, async () => {
+      it(`${hashAlg} + ${signAlg}`, async () => {
+        const testName = `${hashAlg} + ${signAlg}`;
         const cert = await example.createCertificate(hashAlg, signAlg);
 
         const certificate = pkijs.Certificate.fromBER(cert.certificateBuffer);

test/cmsSignedComplexExample.spec.ts

@@ -17,9 +17,7 @@ describe("CMS Signed Complex Example", () => {
     hashAlgs.forEach(hashAlg => {
       addExts.forEach(addExt => {
         detachedSignatures.forEach(detachedSignature => {
-          const testName = `${hashAlg} + ${signAlg}, add ext: ${addExt}, detached signature: ${detachedSignature}`;
-
-          it(testName, async () => {
+          it(`${hashAlg} + ${signAlg}, add ext: ${addExt}, detached signature: ${detachedSignature}`, async () => {
             const cms = await example.createCMSSigned(
               hashAlg,
               signAlg,

test/crlComplexExample.spec.ts

@@ -27,9 +27,8 @@ describe("CRL Complex Example", () => {
 
   signAlgs.forEach(signAlg => {
     hashAlgs.forEach(hashAlg => {
-      const testName = `${hashAlg} + ${signAlg}`;
-
-      it(testName, async () => {
+      it(`${hashAlg} + ${signAlg}`, async () => {
+        const testName = `${hashAlg} + ${signAlg}`;
         const crlWithKey = await example.createCRL(hashAlg, signAlg);
         const crl = pkijs.CertificateRevocationList.fromBER(crlWithKey.crlBuffer);
 

test/functionalTest.spec.ts

@@ -329,7 +329,7 @@ describe("PKIjs functional testing", () => {
       const crypto = new Crypto();
 
       for (const t of tests) {
-        it(t.name, async () => {
+        it(`${t.name}`, async () => {
           const data = new Uint8Array(10).buffer;
           const certData = await createCertificate("SHA-256", "RSASSA-PKCS1-v1_5");
 
@@ -768,7 +768,7 @@ describe("PKIjs functional testing", () => {
     });
 
     for (const t of tests) {
-      it(t.name, () => {
+      it(`${t.name}`, () => {
         if (t.browser) {
           (global as any).self = (global as any).window = { crypto };
         }

test/howToEncryptCMSviaCertificate.spec.ts

@@ -19,9 +19,7 @@ describe("How To Encrypt CMS via Certificate", () => {
       signAlgs.forEach(signAlg => {
         hashAlgs.forEach(hashAlg => {
           oaepHashAlgs.forEach(oaepHashAlg => {
-            const testName = `${encAlg} with ${encLen}, ${hashAlg} + ${signAlg}, OAEP hash: ${oaepHashAlg}`;
-
-            it(testName, async () => {
+            it(`${encAlg} with ${encLen}, ${hashAlg} + ${signAlg}, OAEP hash: ${oaepHashAlg}`, async () => {
               const certWithKey = await utils.createSelfSignedCertificate(hashAlg, signAlg);
               const certRaw = certWithKey.certificate.toSchema().toBER();
               const cmsEnvelopedBuffer = await example.envelopedEncrypt(

test/howToEncryptCMSviaKey.spec.ts

@@ -16,9 +16,7 @@ describe("How To Encrypt CMS via Key Identifier", () => {
     encLens.forEach(encLen => {
       curveNames.forEach(curveName => {
         kdfHashAlgs.forEach(kdfHashAlg => {
-          const testName = `${encAlg} with ${encLen} + ${curveName}, OAEP hash: ${kdfHashAlg}`;
-
-          it(testName, async () => {
+          it(`${encAlg} with ${encLen} + ${curveName}, OAEP hash: ${kdfHashAlg}`, async () => {
             const encryptionAlgorithm = {
               name: encAlg,
               length: encLen,

test/howToEncryptCMSviaPassword.spec.ts

@@ -17,9 +17,7 @@ describe("How To Encrypt CMS via Password", () => {
   encAlgs.forEach(encAlg => {
     encLens.forEach(encLen => {
       encryptionVariants.forEach(encryptionVariant => {
-        const testName = `${encAlg} with ${encLen}, ${encryptionVariant === 2 ? "Password-based encryption" : "Pre-defined KEK"}`;
-
-        it(testName, async () => {
+        it(`${encAlg} with ${encLen}, ${encryptionVariant === 2 ? "Password-based encryption" : "Pre-defined KEK"}`, async () => {
           const encryptionAlgorithm = {
             name: encAlg,
             length: encLen

test/nodePKCS12Example.spec.ts

@@ -1,4 +1,4 @@
-import { describe, it, beforeAll, afterAll } from "vitest";
+import { describe, it, beforeAll, afterAll, expect } from "vitest";
 import * as asn1js from "asn1js";
 import * as pvtsutils from "pvtsutils";
 import * as pvutils from "pvutils";
@@ -281,7 +281,9 @@ describe("Node.js PKCS#12 Example", () => {
     it("Forge 3DES", async () => {
       const windowsP12 =
         "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";
-      return parsePKCS12(pvutils.stringToArrayBuffer(pvutils.fromBase64(windowsP12)), "password");
+      await expect(
+        parsePKCS12(pvutils.stringToArrayBuffer(pvutils.fromBase64(windowsP12)), "password")
+      ).resolves.toBeInstanceOf(pkijs.PFX);
     });
   });
 
@@ -305,22 +307,22 @@ describe("Node.js PKCS#12 Example", () => {
 
     describe("DES-EDE3-CBC algorithm", () => {
       ["SHA-1", "SHA-256", "SHA-384", "SHA-512"].forEach(hashAlg => {
-        it(hashAlg, async () => {
+        it(`${hashAlg}`, async () => {
           const pkcs12Raw = await openSSLLike(
             pkcs8Simpl,
             certSimpl,
             password,
             "DES-EDE3-CBC",
             hashAlg
           );
-          await parsePKCS12(pkcs12Raw, password);
+          await expect(parsePKCS12(pkcs12Raw, password)).resolves.toBeInstanceOf(pkijs.PFX);
         });
       });
     });
 
     it("AES-256-CBC algorithm", async () => {
       const pkcs12Raw = await openSSLLike(pkcs8Simpl, certSimpl, password, "AES-256-CBC");
-      await parsePKCS12(pkcs12Raw, password);
+      await expect(parsePKCS12(pkcs12Raw, password)).resolves.toBeInstanceOf(pkijs.PFX);
     });
   });
 
@@ -341,7 +343,7 @@ describe("Node.js PKCS#12 Example", () => {
     ["DES-EDE3-CBC", "AES-256-CBC"].forEach(encAlg => {
       it(`${encAlg} algorithm`, async () => {
         const pkcs12Raw = await openSSLLike(pkcs8Simpl, attrCertSimpl, password, encAlg);
-        await parsePKCS12(pkcs12Raw, password);
+        await expect(parsePKCS12(pkcs12Raw, password)).resolves.toBeInstanceOf(pkijs.PFX);
       });
     });
   });