feature(3.2.0): add coverage

nestjsx · Mar 26, 2019 · a7d59a5 · a7d59a5
1 parent 7ce69f6
commit a7d59a5
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 25 deletions.
diff --git a/dist/classes/restful-service.class.js b/dist/classes/restful-service.class.js
diff --git a/dist/classes/restful-service.class.js.map b/dist/classes/restful-service.class.js.map
diff --git a/dist/decorators/crud.decorator.js b/dist/decorators/crud.decorator.js
diff --git a/dist/decorators/crud.decorator.js.map b/dist/decorators/crud.decorator.js.map
diff --git a/dist/decorators/helpers.d.ts b/dist/decorators/helpers.d.ts
@@ -14,7 +14,7 @@ export declare function setSwaggerOkResponseMeta(meta: any, func: Function): voi
 export declare function setSwaggerOperationMeta(meta: any, func: Function): void;
 export declare function setSwaggerParamsMeta(meta: any, func: Function): void;
 export declare function setSwaggerOkResponse(func: Function, dto: any, isArray?: boolean): void;
-export declare function setSwaggerOperation(func: Function, summary?: string): void;
+export declare function setSwaggerOperation(func: Function, summary: string): void;
 export declare function setSwaggerParams(func: Function, crudOptions: CrudOptions): void;
 export declare function setSwaggerQueryGetOne(func: Function): void;
 export declare function setSwaggerQueryGetMany(func: Function, name: string): void;

diff --git a/dist/decorators/helpers.js b/dist/decorators/helpers.js
diff --git a/dist/decorators/helpers.js.map b/dist/decorators/helpers.js.map
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestjsx/crud",
-  "version": "3.2.0-beta.2",
+  "version": "3.2.0-beta.1",
   "description": "NestJs CRUD for RESTful APIs",
   "main": "index.js",
   "types": "index.d.ts",

diff --git a/dist/utils.js b/dist/utils.js
diff --git a/dist/utils.js.map b/dist/utils.js.map
diff --git a/src/classes/restful-service.class.ts b/src/classes/restful-service.class.ts
@@ -5,8 +5,7 @@ import { GetManyDefaultResponse, RequestParamsParsed, RestfulOptions } from '../
 export abstract class RestfulService<T> {
   protected abstract options: RestfulOptions;
 
-  constructor() {
-  }
+  constructor() {}
 
   /**
    * Wrap page into page-info
@@ -16,13 +15,22 @@ export abstract class RestfulService<T> {
    * @param limit
    * @param offset
    */
-  public createPageInfo(data: T[], total: number, limit: number, offset: number): GetManyDefaultResponse<T> {
+  public createPageInfo(
+    data: T[],
+    total: number,
+    limit: number,
+    offset: number,
+  ): GetManyDefaultResponse<T> {
     return {
       data,
       count: data.length,
       total,
       page: Math.floor(offset / limit) + 1,
-      pageCount: limit && total ? Math.round(total / limit) : undefined,
+      pageCount:
+        limit && total
+          ? Math.round(total / limit)
+          : /* istanbul ignore next line */
+            undefined,
     };
   }
 

diff --git a/src/decorators/crud.decorator.ts b/src/decorators/crud.decorator.ts
@@ -184,6 +184,8 @@ const baseRoutesInit = {
       @Type((t) => dto)
       bulk: any[];
     }
+    /* istanbul ignore next line */
+    const BultDtoType = hasValidator ? BulkDto : {};
 
     setRouteArgs(
       {
@@ -195,7 +197,7 @@ const baseRoutesInit = {
       target,
       name,
     );
-    setParamTypes([Array, hasValidator ? BulkDto : {}], prototype, name);
+    setParamTypes([Array, BultDtoType], prototype, name);
     setInterceptors(
       [RestfulParamsInterceptor, ...getRouteInterceptors(crudOptions.routes.createManyBase)],
       prototype[name],
@@ -349,7 +351,7 @@ export const Crud = (dto: any, crudOptions: CrudOptions = {}) => (target: object
     if (overrided && route && route.enable) {
       // get base function metadata
       const interceptors = getInterceptors(prototype[name]) || [];
-      const baseInterceptors = getInterceptors(prototype[overrided]) || [];
+      const baseInterceptors = getInterceptors(prototype[overrided]);
       const baseAction = getAction(prototype[overrided]);
       const baseSwaggerParams = getSwaggerParams(prototype[overrided]);
       const baseSwaggerOkResponse = getSwaggeOkResponse(prototype[overrided]);

diff --git a/src/decorators/helpers.ts b/src/decorators/helpers.ts
@@ -88,7 +88,7 @@ export function setSwaggerOkResponse(func: Function, dto: any, isArray?: boolean
   }
 }
 
-export function setSwaggerOperation(func: Function, summary: string = '') {
+export function setSwaggerOperation(func: Function, summary: string) {
   if (swagger) {
     /* istanbul ignore next line */
     const metadata = getSwaggerOperation(func);
@@ -231,6 +231,7 @@ export function setSwaggerQueryGetMany(func: Function, name: string) {
 export function createParamMetadata(
   paramtype: RouteParamtypes,
   index: number,
+  /* istanbul ignore next line */
   pipes: any[] = [],
   data = undefined,
 ): any {
@@ -276,10 +277,12 @@ export function getParsedBody(func: Function) {
 }
 
 export function getParamTypes(prototype: any, name: string) {
+  /* istanbul ignore next line */
   return Reflect.getMetadata(PARAMTYPES_METADATA, prototype, name) || [];
 }
 
 export function getRouteArgs(target: object, name: string) {
+  /* istanbul ignore next line */
   return Reflect.getMetadata(ROUTE_ARGS_METADATA, target, name) || {};
 }
 
@@ -321,7 +324,8 @@ export function setValidationPipe(crudOptions: CrudOptions, group: CrudValidate)
         groups: [group],
         transform: false,
       })
-    : undefined;
+    : /* istanbul ignore next line */
+      undefined;
 }
 
 export function enableRoute(name: BaseRouteName, crudOptions: CrudOptions) {
@@ -425,6 +429,7 @@ export function overrideParsedBody(target: any, baseName: BaseRouteName, name: s
       const paramTypes = getParamTypes(prototype, name) as any[];
       const metatype = paramTypes[parsedBody.index];
       const types = [String, Boolean, Number, Array, Object];
+      /* istanbul ignore next line */
       const toCopy = types.some((t) => metatype === t) || isNil(metatype);
 
       if (toCopy) {

diff --git a/src/utils.ts b/src/utils.ts
@@ -16,6 +16,7 @@ try {
   swaggerPkg = require('@nestjs/swagger/dist/constants');
 } catch (error) {}
 
+/* istanbul ignore next line */
 export const swagger = swaggerPkg ? swaggerPkg : null;
 export const hasValidator = !!classValidatorPkg;
 export const hasTypeorm = !!typeormPkg;
@@ -28,4 +29,5 @@ export const mockValidatorDecorator = (name: string) =>
 export const mockTransformerDecorator = (name: string) =>
   classTransformerPkg && classTransformerPkg[name]
     ? classTransformerPkg[name]
-    : (...args: any[]) => (target, key) => {};
+    : /* istanbul ignore next line */
+      (...args: any[]) => (target, key) => {};
diff --git a/test/typeorm/custom-route.spec.ts b/test/typeorm/custom-route.spec.ts
@@ -61,7 +61,7 @@ class Custom2Controller {
   }
 }
 
-@Crud(Company, {})
+@Crud(Company)
 @Controller('custom1')
 class Custom1Controller {
   constructor(public service: CompaniesService) {}
@@ -206,7 +206,7 @@ describe('Custom routes with @UsePathInterceptors()', () => {
     });
   });
 
-  describe('test params validation', () => {
+  describe('params validation', () => {
     it('should return status 400', () => {
       return request(server)
         .get('/custom2/invalid')
@@ -219,4 +219,20 @@ describe('Custom routes with @UsePathInterceptors()', () => {
         .expect(500);
     });
   });
+
+  describe('decidePagination', () => {
+    it('should return status 200', () => {
+      return request(server)
+        .get('/custom1')
+        .query({ page: 1, limit: 3 })
+        .expect(200)
+        .expect((res) => {
+          expect(res.body).toHaveProperty('data');
+          expect(res.body).toHaveProperty('count');
+          expect(res.body).toHaveProperty('total');
+          expect(res.body).toHaveProperty('page');
+          expect(res.body).toHaveProperty('pageCount');
+        });
+    });
+  });
 });