Apply changes after merge

Author: t.chambard

test/data/apis.ts

@@ -1,8 +1,9 @@
 'use strict';
 
 import {
-    Accept, DELETE, FormParam, GET, Path,
-    PathParam, POST, PUT, QueryParam,
+    Accept, DELETE, FileParam, FormParam, GET,
+    Path, PathParam, POST, PUT,
+    QueryParam,
     Return,
     Security
 } from 'typescript-rest';
@@ -402,25 +403,13 @@ export class ParameterizedEndpoint {
 
     @Path('/file')
     @POST
-    file(@FileParam('file') file: Express.Multer.File): PrimitiveClassModel {
+    public file(@FileParam('file') file: Express.Multer.File): PrimitiveClassModel {
         return new PrimitiveClassModel();
     }
 
     @Path('/stream')
     @POST
-    stream(@swagger.StreamFileParam('stream') file: Express.Multer.File): PrimitiveClassModel {
-        return new PrimitiveClassModel();
-    }
-
-    @Path('/file')
-    @POST
-    file(@FileParam('file') file: Express.Multer.File): PrimitiveClassModel {
-        return new PrimitiveClassModel();
-    }
-
-    @Path('/stream')
-    @POST
-    stream(@swagger.StreamFileParam('stream') file: Express.Multer.File): PrimitiveClassModel {
+    public stream(@swagger.StreamFileParam('stream') file: Express.Multer.File): PrimitiveClassModel {
         return new PrimitiveClassModel();
     }
 }

test/unit/definitions.spec.ts

@@ -361,22 +361,22 @@ describe('Definition generation', () => {
 
     it('should generate formData param for params declared on method', () => {
         const expression = jsonata('paths."/parameterized/{objectId}/file".post.parameters[0].in');
-        expect(expression.evaluate(spec)).to.eq('formData');
+        expect(expression.evaluate(spec)).toEqual('formData');
     });
 
     it('should generate path param for params declared on class', () => {
         const expression = jsonata('paths."/parameterized/{objectId}/stream".post.parameters[0].in');
-        expect(expression.evaluate(spec)).to.eq('formData');
+        expect(expression.evaluate(spec)).toEqual('formData');
     });
 
     it('should generate formData param for params declared on method', () => {
         const expression = jsonata('paths."/parameterized/{objectId}/file".post.parameters[0].in');
-        expect(expression.evaluate(spec)).to.eq('formData');
+        expect(expression.evaluate(spec)).toEqual('formData');
     });
 
     it('should generate path param for params declared on class', () => {
         const expression = jsonata('paths."/parameterized/{objectId}/stream".post.parameters[0].in');
-        expect(expression.evaluate(spec)).to.eq('formData');
+        expect(expression.evaluate(spec)).toEqual('formData');
     });
   });