Fix inconsistencies in transform options tests

Aleksi Pekkala · Aleksi Pekkala · commit c40896637281 · 2017-12-05T18:17:09.000+02:00
diff --git a/test/functional/action-options.spec.ts b/test/functional/action-options.spec.ts
@@ -1,31 +1,21 @@
 import "reflect-metadata";
+import {Exclude, Expose} from "class-transformer";
+import {defaultMetadataStorage} from "class-transformer/storage";
 import {JsonController} from "../../src/decorator/JsonController";
 import {Post} from "../../src/decorator/Post";
 import {Body} from "../../src/decorator/Body";
 import {createExpressServer, createKoaServer, getMetadataArgsStorage} from "../../src/index";
 import {assertRequest} from "./test-utils";
 const expect = require("chakram").expect;
 
-export class User {
-    firstName: string;
-    lastName: string;
-
-    toJSON() {
-        return {firstName: this.firstName}; // lastName is excluded when class-transformer is disabled
-    }
-}
-
 describe("action options", () => {
 
-    let initializedUser: User;
+    let initializedUser: any;
+    let User: any;
 
-    function handler(user: User) {
-        initializedUser = user;
-        const ret = new User();
-        ret.firstName = user.firstName;
-        ret.lastName = user.lastName || "default";
-        return ret;
-    }
+    after(() => {
+        defaultMetadataStorage.clear();
+    });
 
     beforeEach(() => {
         initializedUser = undefined;
@@ -36,13 +26,30 @@ describe("action options", () => {
         // reset metadata args storage
         getMetadataArgsStorage().reset();
 
+        @Exclude()
+        class UserModel {
+            @Expose()
+            firstName: string;
+
+            lastName: string;
+        }
+        User = UserModel;
+
+        function handler(user: UserModel) {
+            initializedUser = user;
+            const ret = new User();
+            ret.firstName = user.firstName;
+            ret.lastName = user.lastName || "default";
+            return ret;
+        }
+
         @JsonController("", {transformResponse: false})
-        class DefaultController {
+        class NoTransformResponseController {
             @Post("/default")
-            default(@Body() user: User) { return handler(user); }
+            default(@Body() user: UserModel) { return handler(user); }
 
             @Post("/override", {transformRequest: false, transformResponse: true})
-            transform(@Body() user: User) { return handler(user); }
+            transform(@Body() user: UserModel) { return handler(user); }
         }
     });
 
@@ -52,19 +59,21 @@ describe("action options", () => {
     before(done => koaApp = createKoaServer().listen(3002, done));
     after(done => koaApp.close(done));
 
-    describe("use controller options when action transform options are not set", () => {
+    it("should use controller options when action transform options are not set", () => {
         assertRequest([3001, 3002], "post", "default", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
             expect(initializedUser).to.be.instanceOf(User);
+            expect(initializedUser.lastName).to.be.undefined;
             expect(response).to.have.status(200);
-            expect(response.body.lastName).to.be.defined;
+            expect(response.body.lastName).to.exist;
         });
     });
 
-    describe("override controller options when action transform options are set", () => {
+    it("should override controller options when action transform options are set", () => {
         assertRequest([3001, 3002], "post", "override", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
             expect(initializedUser).not.to.be.instanceOf(User);
+            expect(initializedUser.lastName).to.exist;
             expect(response).to.have.status(200);
-            expect(response.body.lastName).to.be.defined;
+            expect(response.body.lastName).to.be.undefined;
         });
     });
 });
diff --git a/test/functional/class-transformer-options.ts b/test/functional/class-transformer-options.ts
@@ -17,16 +17,20 @@ describe("class transformer options", () => {
         keyword: string;
     }
 
-    class UserModel {
-        id: number;
-        _firstName: string;
-        _lastName: string;
-
-        @Expose()
-        get name(): string {
-            return this._firstName + " " + this._lastName;
+    let UserModel: any;
+    before(() => {
+        class User {
+            id: number;
+            _firstName: string;
+            _lastName: string;
+
+            @Expose()
+            get name(): string {
+                return this._firstName + " " + this._lastName;
+            }
         }
-    }
+        UserModel = User;
+    });
 
     after(() => {
         defaultMetadataStorage.clear();
@@ -180,4 +184,4 @@ describe("class transformer options", () => {
         });
     });
 
-});
+});
diff --git a/test/functional/class-validator-options.spec.ts b/test/functional/class-validator-options.spec.ts
@@ -208,4 +208,4 @@ describe("parameters auto-validation", () => {
         });
     });
 
-});
+});
diff --git a/test/functional/controller-options.spec.ts b/test/functional/controller-options.spec.ts
@@ -1,30 +1,21 @@
 import "reflect-metadata";
+import {Exclude, Expose} from "class-transformer";
+import {defaultMetadataStorage} from "class-transformer/storage";
 import {JsonController} from "../../src/decorator/JsonController";
 import {Post} from "../../src/decorator/Post";
 import {Body} from "../../src/decorator/Body";
 import {createExpressServer, createKoaServer, getMetadataArgsStorage} from "../../src/index";
 import {assertRequest} from "./test-utils";
 const expect = require("chakram").expect;
 
-export class User {
-    firstName: string;
-    lastName: string;
-
-    toJSON() {
-        return {firstName: this.firstName}; // lastName is excluded when class-transformer is disabled
-    }
-}
-
 describe("controller options", () => {
 
-    let initializedUser: User;
-    function handler(user: User) {
-        initializedUser = user;
-        const ret = new User();
-        ret.firstName = user.firstName;
-        ret.lastName = user.lastName || "default";
-        return ret;
-    }
+    let initializedUser: any;
+    let User: any;
+
+    after(() => {
+        defaultMetadataStorage.clear();
+    });
 
     beforeEach(() => {
         initializedUser = undefined;
@@ -35,22 +26,39 @@ describe("controller options", () => {
         // reset metadata args storage
         getMetadataArgsStorage().reset();
 
+        @Exclude()
+        class UserModel {
+            @Expose()
+            firstName: string;
+
+            lastName: string;
+        }
+        User = UserModel;
+
+        function handler(user: UserModel) {
+            initializedUser = user;
+            const ret = new User();
+            ret.firstName = user.firstName;
+            ret.lastName = user.lastName || "default";
+            return ret;
+        }
+
         @JsonController("/default")
         class DefaultController {
             @Post("/")
-            postUsers(@Body() user: User) { return handler(user); }
+            postUsers(@Body() user: UserModel) { return handler(user); }
         }
 
         @JsonController("/transform", {transformRequest: true, transformResponse: true})
-        class NoResponseTransformController {
+        class TransformController {
             @Post("/")
-            postUsers(@Body() user: User) { return handler(user); }
+            postUsers(@Body() user: UserModel) { return handler(user); }
         }
 
         @JsonController("/noTransform", {transformRequest: false, transformResponse: false})
-        class NoRequestTransformController {
+        class NoTransformController {
             @Post("/")
-            postUsers(@Body() user: User) { return handler(user); }
+            postUsers(@Body() user: UserModel) { return handler(user); }
         }
 
     });
@@ -64,24 +72,27 @@ describe("controller options", () => {
     describe("controller transform is enabled by default", () => {
         assertRequest([3001, 3002], "post", "default", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
             expect(initializedUser).to.be.instanceOf(User);
+            expect(initializedUser.lastName).to.be.undefined;
             expect(response).to.have.status(200);
-            expect(response.body.lastName).to.be.defined;
+            expect(response.body.lastName).to.be.undefined;
         });
     });
 
     describe("when controller transform is enabled", () => {
         assertRequest([3001, 3002], "post", "transform", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
             expect(initializedUser).to.be.instanceOf(User);
+            expect(initializedUser.lastName).to.be.undefined;
             expect(response).to.have.status(200);
-            expect(response.body.lastName).not.to.be.undefined;
+            expect(response.body.lastName).to.be.undefined;
         });
     });
 
     describe("when controller transform is disabled", () => {
         assertRequest([3001, 3002], "post", "noTransform", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
             expect(initializedUser).not.to.be.instanceOf(User);
+            expect(initializedUser.lastName).to.exist;
             expect(response).to.have.status(200);
-            expect(response.body.lastName).to.be.defined;
+            expect(response.body.lastName).to.exist;
         });
     });
 
diff --git a/test/functional/global-options.spec.ts b/test/functional/global-options.spec.ts
@@ -1,24 +1,21 @@
 import "reflect-metadata";
+import {Exclude, Expose} from "class-transformer";
+import {defaultMetadataStorage} from "class-transformer/storage";
 import {JsonController} from "../../src/decorator/JsonController";
 import {Post} from "../../src/decorator/Post";
 import {Body} from "../../src/decorator/Body";
 import {createExpressServer, createKoaServer, getMetadataArgsStorage} from "../../src/index";
 import {assertRequest} from "./test-utils";
-const chakram = require("chakram");
-const expect = chakram.expect;
-
-export class User {
-    firstName: string;
-    lastName: string;
-
-    toJSON() {
-        return {firstName: this.firstName}; // lastName is excluded when class-transformer is disabled
-    }
-}
+const expect = require("chakram").expect;
 
 describe("routing-controllers global options", () => {
 
-    let initializedUser: User;
+    let initializedUser: any;
+    let User: any;
+
+    after(() => {
+        defaultMetadataStorage.clear();
+    });
 
     beforeEach(() => {
         initializedUser = undefined;
@@ -29,11 +26,20 @@ describe("routing-controllers global options", () => {
         // reset metadata args storage
         getMetadataArgsStorage().reset();
 
+        @Exclude()
+        class UserModel {
+            @Expose()
+            firstName: string;
+
+            lastName: string;
+        }
+        User = UserModel;
+
         @JsonController()
         class TestUserController {
 
             @Post("/users")
-            postUsers(@Body() user: User) {
+            postUsers(@Body() user: UserModel) {
                 initializedUser = user;
                 const ret = new User();
                 ret.firstName = user.firstName;
@@ -42,7 +48,7 @@ describe("routing-controllers global options", () => {
             }
 
             @Post(new RegExp("/(prefix|regex)/users"))
-            postUsersWithRegex(@Body() user: User) {
+            postUsersWithRegex(@Body() user: UserModel) {
                 initializedUser = user;
                 return "";
             }
@@ -60,8 +66,9 @@ describe("routing-controllers global options", () => {
 
         assertRequest([3001, 3002], "post", "users", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
             expect(initializedUser).to.be.instanceOf(User);
+            expect(initializedUser.lastName).to.be.undefined;
             expect(response).to.have.status(200);
-            expect(response.body.lastName).to.be.defined;
+            expect(response.body.lastName).to.be.undefined;
         });
     });
 
@@ -75,8 +82,9 @@ describe("routing-controllers global options", () => {
 
         assertRequest([3001, 3002], "post", "users", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
             expect(initializedUser).to.be.instanceOf(User);
+            expect(initializedUser.lastName).to.be.undefined;
             expect(response).to.have.status(200);
-            expect(response.body.lastName).to.be.defined;
+            expect(response.body.lastName).to.be.undefined;
         });
     });
 
@@ -90,8 +98,9 @@ describe("routing-controllers global options", () => {
 
         assertRequest([3001, 3002], "post", "users", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
             expect(initializedUser).not.to.be.instanceOf(User);
+            expect(initializedUser.lastName).to.exist;
             expect(response).to.have.status(200);
-            expect(response.body.lastName).to.be.undefined;
+            expect(response.body.lastName).to.exist;
         });
     });
 

-Original file line number
+Diff line change
         });
     });
 -});
 +});