changes

Signed-off-by: NishantSinghhhhh <[email protected]>

Author: NishantSinghhhhh

package.json

@@ -146,12 +146,10 @@
     "graphql-markdown": "^7.3.0",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
-    "mongodb-memory-server": "^10.1.3",
     "nodemon": "^3.1.7",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
     "supertest": "^7.0.0",
-    "ts-node": "^10.9.2",
     "tsx": "^4.19.1",
     "typescript": "^5.6.2",
     "vitest": "^2.1.3"

scripts/updateTest.ts

@@ -279,58 +279,88 @@ const filesystemTests = [
 ];
 
 function updateTestFile(filePath: string): void {
-  let content = fs.readFileSync(filePath, "utf-8");
+  console.log(`Processing file: ${filePath}`);
 
-  const beforeAllAddition = `
-    beforeAll(async () => {
-      this.testPath = await ${generateUniqueTestPath()};
-      await fs.promises.mkdir(this.testPath, { recursive: true });
-    });
-  `;
+  let content = fs.readFileSync(filePath, "utf-8");
+  console.log("Initial content:\n", content);
 
-  const afterAllAddition = `
-    afterAll(async () => {
-      if (this.testPath && await fs.promises.access(this.testPath).then(() => true).catch(() => false)) {
-        await fs.promises.rm(this.testPath, { recursive: true, force: true });
-      }
-    });
-  `;
+  // Add BaseTest import if not present
+  if (!content.includes("import { BaseTest }")) {
+    content = `import { BaseTest } from "../../helpers/testHelper/baseTest";\n${content}`;
+  }
 
-  // Add imports if needed
-  if (!content.includes("import * as os")) {
-    content = `import * as os from 'os';\n${content}`;
+  // Add Vitest imports if not present
+  if (!content.includes("import { describe, beforeAll, afterAll }")) {
+    content = `import { test } from 'vitest';\n${content}`;
   }
 
-  content = content
-    .replace(/fs\.promises\.(read|write|mkdir|rm)Sync/g, "await fs.promises.$1")
-    .replace(/describe\([^{]*{/, `$&\n  let testPath: string;\n`)
-    .replace(/beforeAll\([^{]*{/, (match) => {
-      if (match.includes("testPath")) return match;
-      return `${beforeAllAddition}${match}`;
-    })
-    .replace(/afterAll\([^{]*{/, (match) => {
-      if (match.includes("testPath")) return match;
-      return `${afterAllAddition}${match}`;
-    });
+  // // Add vi.setTimeout if not present
+  // if (!content.includes("vi.setTimeout")) {
+  //   content = `vi.setTimeout(15000);\n${content}`;
+  // }
+
+  // Add test instance and data declarations
+  const testInstanceDeclaration = `
+  let testInstance: BaseTest;
+  let testData: {
+    testUser: { name: string; email: string };
+    testOrg: { name: string };
+  };`;
 
-  content = content
-    .replace(/describe\.concurrent/g, "describe")
-    .replace(/it\.concurrent/g, "it");
+  if (!content.includes("let testInstance: BaseTest")) {
+    content = content.replace(
+      /describe\([^{]*{/,
+      `$&\n${testInstanceDeclaration}`,
+    );
+  }
+
+  // Add BaseTest beforeAll hook if not present
+  const baseTestBeforeAll = `
+  beforeAll(async () => {
+    testInstance = new BaseTest();
+    try {
+      testData = await testInstance.beforeEach();
+    } catch (error) {
+      console.error('Error in beforeAll:', error);
+      throw error;
+    }
+  }, { timeout: 30000 });`;
 
-  // Add the beforeAll and afterAll hooks if not already present
   if (!content.includes("beforeAll(async () =>")) {
-    content = content.replace(/describe\([^{]*{/, `$&${beforeAllAddition}`);
+    content = content.replace(/describe\([^{]*{/, `$&\n${baseTestBeforeAll}`);
   }
+
+  // Add BaseTest afterAll hook if not present
+  const baseTestAfterAll = `
+  afterAll(async () => {
+    try {
+      await testInstance.afterEach();
+    } catch (error) {
+      console.error('Error in afterAll:', error);
+      throw error;
+    }
+  }, { timeout: 30000 });`;
+
   if (!content.includes("afterAll(async () =>")) {
-    content = content.replace(/describe\([^{]*{/, `$&${afterAllAddition}`);
+    content = content.replace(/describe\([^{]*{/, `$&\n${baseTestAfterAll}`);
   }
 
-  fs.writeFileSync(filePath, content, "utf-8");
-  console.log(`Updated: ${filePath}`);
-}
+  // Replace `describe.concurrent` with `describe`
+  content = content.replace(/describe\.concurrent/g, "describe");
 
-function generateUniqueTestPath(): string {
-  return `os.tmpdir() + '/test-path-' + Date.now()`;
+  // Replace `it.concurrent` with `test`
+  content = content.replace(/it\.concurrent/g, "test");
+
+  // Replace `it` with `test` and add correct syntax
+  content = content.replace(/\bit\(/g, "test(");
+  content = content.replace(
+    /test\(['"](.*?)['"]\s*,\s*async\s*\([^)]*\)\s*=>\s*{/g,
+    'test("$1", async () => {',
+  );
+
+  // Write updated content back to the file
+  fs.writeFileSync(filePath, content, "utf-8");
+  console.log(`Updated file: ${filePath}`);
 }
 
 try {

tests/directives/directiveTransformer/authDirectiveTransformer.spec.ts

@@ -1,17 +1,18 @@
 import { beforeAll, afterAll, it, expect } from "vitest";
+import { connect, disconnect } from "../../helpers/db";
+import type mongoose from "mongoose";
 import { ApolloServer } from "@apollo/server";
 import { gql } from "graphql-tag";
 import "dotenv/config";
 import i18n from "i18n";
 import express from "express";
-// import type { TestUserType } from "../../helpers/userAndOrg";
-// import { createTestUserFunc } from "../../helpers/user";
+import type { TestUserType } from "../../helpers/userAndOrg";
+import { createTestUserFunc } from "../../helpers/user";
 import { makeExecutableSchema } from "@graphql-tools/schema";
 import authDirectiveTransformer from "../../../src/directives/directiveTransformer/authDirectiveTransformer";
 import roleDirectiveTransformer from "../../../src/directives/directiveTransformer/roleDirectiveTransformer";
 import { appConfig } from "../../../src/config";
 import { errors } from "../../../src/libraries";
-import { BaseTest } from "../../helpers/testHelper/baseTest";
 import enLocale from "../../../locales/en.json";
 import hiLocale from "../../../locales/hi.json";
 import zhLocale from "../../../locales/zh.json";
@@ -37,7 +38,7 @@ i18n.configure({
 });
 app.use(i18n.init);
 
-// let testUser: TestUserType;
+let testUser: TestUserType;
 
 const typeDefs = gql`
   directive @auth on FIELD_DEFINITION
@@ -53,18 +54,16 @@ const resolvers = {
   },
 };
 
-let testInstance: BaseTest;
-let testData: {
-  testUser: { name: string; email: string };
-  testOrg: { name: string };
-};
+let MONGOOSE_INSTANCE: typeof mongoose;
+
 beforeAll(async () => {
-  testInstance = new BaseTest();
-  testData = await testInstance.beforeEach();
+  MONGOOSE_INSTANCE = await connect();
+  testUser = await createTestUserFunc();
 });
 
 afterAll(async () => {
-  await testInstance.afterEach();
+  await testUser?.deleteOne();
+  await disconnect(MONGOOSE_INSTANCE);
 });
 
 it("throws UnauthenticatedError when context is expired", async () => {
@@ -176,39 +175,6 @@ it("checks if the resolver is supplied, and return null data, if not", async ()
   expect(result.body.singleResult.data).toEqual({ hello: null });
 });
 
-it("uses testUser from testData in context", async () => {
-  const query = `
-    query {
-      hello
-    }
-  `;
-  const authenticatedContext = {
-    isAuth: true,
-    user: testData.testUser, // Use testUser in the context
-  };
-
-  let schema = makeExecutableSchema({
-    typeDefs,
-    resolvers,
-  });
-
-  schema = authDirectiveTransformer(schema, "auth");
-  const apolloServer = new ApolloServer({ schema });
-
-  const result = await apolloServer.executeOperation(
-    {
-      query,
-      variables: {},
-    },
-    {
-      contextValue: authenticatedContext,
-    },
-  );
-
-  //@ts-expect-error-ignore
-  expect(result.body.singleResult.data).toEqual({ hello: "hi" });
-});
-
 it("returns data if isAuth == true and expire == false", async () => {
   const query = `
     query {