fix: tests and formatting

evanshortiss · Jun 27, 2019 · 9f1a160 · 9f1a160
1 parent dbb2682
commit 9f1a160
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/example/typescript/route.ts b/example/typescript/route.ts
@@ -1,7 +1,10 @@
-
 import * as Joi from '@hapi/joi'
-import { ValidatedRequest, ValidatedRequestSchema, createValidator } from '../../express-joi-validation'
-import { Router } from 'express';
+import {
+  ValidatedRequest,
+  ValidatedRequestSchema,
+  createValidator
+} from '../../express-joi-validation'
+import { Router } from 'express'
 import 'joi-extract-type'
 
 const route = Router()
@@ -14,8 +17,12 @@ interface HelloRequestSchema extends ValidatedRequestSchema {
   query: Joi.extractType<typeof querySchema>
 }
 
-route.get('/hello', validator.query(querySchema), (req: ValidatedRequest<HelloRequestSchema>, res) => {
-  res.end(`Hello ${req.query.name}`)
-})
+route.get(
+  '/hello',
+  validator.query(querySchema),
+  (req: ValidatedRequest<HelloRequestSchema>, res) => {
+    res.end(`Hello ${req.query.name}`)
+  }
+)
 
 export = route
diff --git a/example/typescript/server.ts b/example/typescript/server.ts
@@ -5,7 +5,7 @@ const port = 3030
 import * as express from 'express'
 import * as Joi from '@hapi/joi'
 import * as HelloWorld from './route'
-import { createValidator } from '../../express-joi-validation';
+import { createValidator } from '../../express-joi-validation'
 
 const app = express()
 const validator = createValidator()

diff --git a/express-joi-validation.js b/express-joi-validation.js
@@ -59,8 +59,10 @@ function buildErrorString(err, container) {
   return ret
 }
 
-module.exports = function () {
-  throw new Error('express-joi-validation: exported member is no longer a factory function. use exported createValidator function instead')
+module.exports = function() {
+  throw new Error(
+    'express-joi-validation: exported member is no longer a factory function. use exported createValidator function instead'
+  )
 }
 
 module.exports.createValidator = function generateJoiMiddlewareInstance(cfg) {

diff --git a/index.test.js b/index.test.js
@@ -91,7 +91,7 @@ describe('express joi', function() {
         .required()
     })
 
-    mod = require('./express-joi-validation.js')()
+    mod = require('./express-joi-validation.js').createValidator()
   })
 
   describe('#headers', function() {
@@ -251,7 +251,7 @@ describe('express joi', function() {
 
   describe('optional configs', function() {
     it('should call next on error via config.passError', function(done) {
-      const mod = require('./express-joi-validation.js')({
+      const mod = require('./express-joi-validation.js').createValidator({
         passError: true
       })
       const mw = mod.query(
@@ -300,7 +300,7 @@ describe('express joi', function() {
       }
       resStub.status = sinon.stub().returns(resStub)
 
-      const mod = require('./express-joi-validation.js')({
+      const mod = require('./express-joi-validation.js').createValidator({
         joi: joiStub,
         statusCode: statusCode
       })