chore: fix tests

ThanatosGit · Sep 28, 2024 · ed54e29 · ed54e29
1 parent f2f8290
commit ed54e29
Show file tree

Hide file tree

Showing 64 changed files with 299 additions and 506 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -9,7 +9,7 @@ import {join} from "node:path";
 
 export default [
   {
-    ignores: ["**/coverage", "**/lib", "**/dist", "processes.config.js", "**/templates", "**/docs/**", "**/docs-references/**"]
+    ignores: ["**/coverage", "**/lib", "**/dist", "processes.config.js", "**/snapshots", "**/templates", "**/docs/**", "**/docs-references/**"]
   },
   {
     files: ["**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"],

diff --git a/packages/graphql/typegraphql/test/app/Server.ts b/packages/graphql/typegraphql/test/app/Server.ts
@@ -1,7 +1,7 @@
 import "@tsed/ajv";
 import "@tsed/graphql-ws";
 import "@tsed/passport";
-import "../..";
+import "../../src/index.js";
 import "./graphql/index.js";
 import "./protocols/GraphQLProtocol.js";
 import "./services/RecipeService.js";

diff --git a/packages/graphql/typegraphql/test/app/graphql/datasources/MyDataSource.ts b/packages/graphql/typegraphql/test/app/graphql/datasources/MyDataSource.ts
@@ -2,7 +2,7 @@ import {RESTDataSource} from "@apollo/datasource-rest";
 import {ApolloContext} from "@tsed/apollo";
 import {InjectContext} from "@tsed/common";
 
-import {DataSource} from "../../../..";
+import {DataSource} from "../../../../src/index.js";
 
 @DataSource()
 export class MyDataSource extends RESTDataSource {

diff --git a/packages/graphql/typegraphql/test/app/graphql/recipes/RecipeResolver.ts b/packages/graphql/typegraphql/test/app/graphql/recipes/RecipeResolver.ts
@@ -2,7 +2,7 @@ import {InjectContext, PlatformContext} from "@tsed/common";
 import {Inject} from "@tsed/di";
 import {Arg, Mutation, Query, Root, Subscription} from "type-graphql";
 
-import {ResolverController} from "../../../..";
+import {ResolverController} from "../../../../src/index.js";
 import {RecipeService} from "../../services/RecipeService";
 import {PubSubProvider} from "../pubsub/pubsub.js";
 import {Recipe, RecipeNotification} from "./Recipe";

diff --git a/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts b/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts
@@ -1,4 +1,4 @@
-import faker from "@faker-js/faker";
+import {faker} from "@faker-js/faker";
 import {PlatformTest} from "@tsed/common";
 import {Property} from "@tsed/schema";
 

diff --git a/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts b/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts
@@ -1,4 +1,4 @@
-import faker from "@faker-js/faker";
+import {faker} from "@faker-js/faker";
 import {PlatformTest} from "@tsed/common";
 import {deserialize} from "@tsed/json-mapper";
 import {Format, getJsonSchema, Name, Property} from "@tsed/schema";
@@ -134,7 +134,7 @@ describe("MemoryAdapter", () => {
         name: faker.name.jobTitle()
       };
 
-      const client = await adapter.updateOne({_id: faker.datatype.uuid()}, base);
+      const client = await adapter.updateOne({_id: faker.string.uuid()}, base);
 
       expect(client).toBeUndefined();
     });

diff --git a/packages/orm/ioredis/src/utils/registerConnectionProvider.spec.ts b/packages/orm/ioredis/src/utils/registerConnectionProvider.spec.ts
@@ -1,5 +1,5 @@
 import {DITest} from "@tsed/di";
-import Redis from "ioredis";
+import {Redis} from "ioredis";
 
 import {registerConnectionProvider} from "./registerConnectionProvider.js";
 
@@ -38,7 +38,7 @@ vi.mock("ioredis", () => {
     }
   }
 
-  return {default: MockRedis};
+  return {Redis: MockRedis};
 });
 
 const REDIS_CONNECTION = Symbol.for("REDIS_CONNECTION");

diff --git a/packages/orm/mongoose/test/buffer.integration.spec.ts b/packages/orm/mongoose/test/buffer.integration.spec.ts
@@ -1,4 +1,4 @@
-import faker from "@faker-js/faker";
+import {faker} from "@faker-js/faker";
 import {PlatformTest} from "@tsed/common";
 import {TestContainersMongo} from "@tsed/testcontainers-mongo";
 import axios from "axios";
@@ -15,7 +15,7 @@ describe("Mongoose", () => {
       "Should save and load buffer",
       PlatformTest.inject([TestAvatar], async (avatarModel: MongooseModel<TestAvatar>) => {
         const imageBuffer = await axios
-          .get(faker.image.people(256, 256), {
+          .get(faker.image.avatarGitHub(), {
             responseType: "arraybuffer"
           })
           .then((response) => Buffer.from(response.data, "binary"));

diff --git a/packages/orm/mongoose/test/helpers/Server.ts b/packages/orm/mongoose/test/helpers/Server.ts
@@ -1,4 +1,4 @@
-import "../..";
+import "../../src/index.js";
 import "@tsed/platform-express";
 
 import {Configuration, Inject, PlatformApplication} from "@tsed/common";

diff --git a/packages/orm/mongoose/test/helpers/models/Customer.ts b/packages/orm/mongoose/test/helpers/models/Customer.ts
@@ -1,6 +1,6 @@
 import {CollectionOf} from "@tsed/schema";
 
-import {Model, ObjectID, Ref} from "../../..";
+import {Model, ObjectID, Ref} from "../../../src/index.js";
 import {TestClient} from "./Client.js";
 import {TestContract} from "./Contract.js";
 

diff --git a/packages/orm/mongoose/test/helpers/models/User.ts b/packages/orm/mongoose/test/helpers/models/User.ts
@@ -1,6 +1,6 @@
 import {CollectionOf, Groups, Ignore, MinLength, Property, Required} from "@tsed/schema";
 
-import {Model, MongooseNextCB, ObjectID, PostHook, PreHook, Ref, Schema, Unique} from "../../..";
+import {Model, MongooseNextCB, ObjectID, PostHook, PreHook, Ref, Schema, Unique} from "../../../src/index.js";
 
 export class BaseModel {
   @ObjectID("id")

diff --git a/packages/orm/mongoose/test/helpers/models/UserWorkspace.ts b/packages/orm/mongoose/test/helpers/models/UserWorkspace.ts
@@ -1,7 +1,7 @@
 import {CollectionOf, Property} from "@tsed/schema";
 import {Types} from "mongoose";
 
-import {Model, MongooseModel, ObjectID, Ref, Schema} from "../../..";
+import {Model, MongooseModel, ObjectID, Ref, Schema} from "../../../src/index.js";
 
 @Model()
 export class Workspace {

diff --git a/packages/orm/mongoose/test/multipleConnection.integration.spec.ts b/packages/orm/mongoose/test/multipleConnection.integration.spec.ts
@@ -1,8 +1,9 @@
 import {PlatformTest} from "@tsed/common";
 import {Property} from "@tsed/schema";
 import {TestContainersMongo} from "@tsed/testcontainers-mongo";
+import {afterEach, beforeEach, describe, expect, it} from "vitest";
 
-import {Model, MongooseModel, MongooseService, ObjectID} from "..";
+import {Model, MongooseModel, MongooseService, ObjectID} from "../src/index.js";
 import {Server} from "./helpers/Server.js";
 
 @Model({

diff --git a/packages/orm/mongoose/test/ref-array.integration.spec.ts b/packages/orm/mongoose/test/ref-array.integration.spec.ts
@@ -1,4 +1,4 @@
-import faker from "@faker-js/faker";
+import {faker} from "@faker-js/faker";
 import {BodyParams, Controller, Get, Inject, PlatformTest, Post, QueryParams} from "@tsed/common";
 import {deserialize, serialize} from "@tsed/json-mapper";
 import {PlatformExpress} from "@tsed/platform-express";
@@ -36,12 +36,12 @@ class ProfilesCtrl {
 async function getServiceFixture() {
   const baseUser = {
     email: faker.internet.email(),
-    password: faker.internet.password(12)
+    password: faker.internet.password({length: 12})
   };
 
   const baseProfile = {
     image: faker.image.avatar(),
-    age: faker.datatype.number(2)
+    age: faker.number.int(2)
   };
 
   const repository = PlatformTest.get<ProfilesCtrl>(ProfilesCtrl)!;

diff --git a/packages/orm/mongoose/test/ref.integration.spec.ts b/packages/orm/mongoose/test/ref.integration.spec.ts
@@ -1,4 +1,4 @@
-import faker from "@faker-js/faker";
+import {faker} from "@faker-js/faker";
 import {BodyParams, Controller, Get, Inject, PlatformTest, Post, QueryParams} from "@tsed/common";
 import {deserialize, serialize} from "@tsed/json-mapper";
 import {PlatformExpress} from "@tsed/platform-express";
@@ -35,12 +35,12 @@ class ProfilesCtrl {
 
 const baseUser = {
   email: faker.internet.email(),
-  password: faker.internet.password(12)
+  password: faker.internet.password({length: 12})
 };
 
 const baseProfile = {
   image: faker.image.avatar(),
-  age: faker.datatype.number(2)
+  age: faker.number.int(2)
 };
 
 async function getServiceFixture() {

diff --git a/packages/orm/mongoose/test/resources.integration.spec.ts b/packages/orm/mongoose/test/resources.integration.spec.ts
@@ -1,4 +1,4 @@
-import faker from "@faker-js/faker";
+import {faker} from "@faker-js/faker";
 import {BodyParams, Controller, Get, Inject, Injectable, PathParams, PlatformTest, Post} from "@tsed/common";
 import {isArray} from "@tsed/core";
 import {deserialize} from "@tsed/json-mapper";
@@ -75,7 +75,7 @@ class ResourcesCtrl {
 
     await role.save();
 
-    user.name = faker.name.firstName();
+    user.name = faker.person.firstName();
 
     user.roles = [role._id];
 
@@ -93,12 +93,12 @@ async function getServiceFixture() {
 
   const baseUser = {
     email: faker.internet.email(),
-    password: faker.internet.password(12)
+    password: faker.internet.password({length: 12})
   };
 
   const baseUser2 = {
     email: faker.internet.email(),
-    password: faker.internet.password(12)
+    password: faker.internet.password({length: 12})
   };
 
   const currentUser2 = await repository.create(baseUser2);

diff --git a/packages/orm/mongoose/test/user.integration.spec.ts b/packages/orm/mongoose/test/user.integration.spec.ts
@@ -1,4 +1,4 @@
-import faker from "@faker-js/faker";
+import {faker} from "@faker-js/faker";
 import {PlatformTest} from "@tsed/common";
 import {TestContainersMongo} from "@tsed/testcontainers-mongo";
 
@@ -16,7 +16,7 @@ describe("Mongoose", () => {
         // GIVEN
         const user = new userModel({
           email: "[email protected]",
-          password: faker.internet.password(12)
+          password: faker.internet.password({length: 12})
         });
 
         // WHEN
@@ -42,7 +42,7 @@ describe("Mongoose", () => {
         // GIVEN
         const user = new userModel({
           email: "[email protected]",
-          password: faker.internet.password(12)
+          password: faker.internet.password({length: 12})
         });
 
         // WHEN

diff --git a/packages/orm/objection/test/helpers/Server.ts b/packages/orm/objection/test/helpers/Server.ts
@@ -1,4 +1,4 @@
-import "../..";
+import "../../src/index.js";
 import "@tsed/platform-express";
 
 import {Configuration, Inject, PlatformApplication} from "@tsed/common";

diff --git a/packages/orm/objection/test/helpers/models/User.ts b/packages/orm/objection/test/helpers/models/User.ts
@@ -1,8 +1,7 @@
 import {Groups, MaxLength, MinLength, Required} from "@tsed/schema";
 import {Model} from "objection";
 
-import {Entity} from "../../..";
-import {IdColumn} from "../../../src/index.js";
+import {Entity, IdColumn} from "../../../src/index.js";
 
 @Entity("users")
 export class User extends Model {

diff --git a/packages/platform/common/test/integration/groups.spec.ts b/packages/platform/common/test/integration/groups.spec.ts
@@ -10,7 +10,7 @@ import cookieParser from "cookie-parser";
 import methodOverride from "method-override";
 import SuperTest from "supertest";
 
-import {BodyParams, Configuration, Controller, Get, PlatformTest} from "../..";
+import {BodyParams, Configuration, Controller, Get, PlatformTest} from "../../src/index.ts";
 
 const rootDir = __dirname; // automatically replaced by import.meta.dirname on build
 

diff --git a/packages/platform/common/test/integration/platform.spec.ts b/packages/platform/common/test/integration/platform.spec.ts
@@ -8,7 +8,7 @@ import cookieParser from "cookie-parser";
 import methodOverride from "method-override";
 import SuperTest from "supertest";
 
-import {Configuration, Controller, Get, PlatformTest} from "../..";
+import {Configuration, Controller, Get, PlatformTest} from "../../src/index.js";
 
 const rootDir = __dirname; // automatically replaced by import.meta.dirname on build
 

diff --git a/packages/platform/common/test/integration/route.spec.ts b/packages/platform/common/test/integration/route.spec.ts
@@ -1,9 +1,6 @@
 import {OperationVerbs} from "@tsed/schema";
 
-import {All, Delete, EndpointMetadata, Get, Head, Options, Patch, Post, Put} from "../..";
-
-const middleware: any = vi.fn();
-const useStub: any = vi.fn().mockReturnValue(middleware);
+import {All, Delete, EndpointMetadata, Get, Head, Options, Patch, Post, Put} from "../../src/index.js";
 
 describe("Route decorators", () => {
   describe("All", () => {

diff --git a/packages/platform/platform-exceptions/package.json b/packages/platform/platform-exceptions/package.json
@@ -31,6 +31,7 @@
     "@tsed/exceptions": "workspace:*",
     "@tsed/schema": "workspace:*",
     "@tsed/typescript": "workspace:*",
+    "ajv": "^8.17.1",
     "eslint": "^8.57.0",
     "typescript": "4.9.5",
     "vitest": "2.0.4"

diff --git a/packages/platform/platform-koa/test/app/index.ts b/packages/platform/platform-koa/test/app/index.ts
@@ -1,6 +1,6 @@
 import {$log, Controller, Get} from "@tsed/common";
 
-import {PlatformKoa} from "../..";
+import {PlatformKoa} from "../../src/index.js";
 import {Server} from "./Server.js";
 
 if (process.env.NODE_ENV !== "test") {