From 52da1d79179f95b2240f258bf7cdd4a3eb6afcb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 14 Sep 2019 19:26:57 +0200 Subject: [PATCH] fix: make tests pass --- index.js | 2 +- test.js | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 09cc850..3009aad 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,7 @@ var assert = require('assert'); var defaultMessage = 'valid mongo id'; module.exports = function joiObjectId(Joi, message) { - assert(Joi && Joi.isJoi, 'you must pass Joi as an argument'); + assert(Joi && Joi.object, 'you must pass Joi as an argument'); if (message == undefined) { message = defaultMessage; } diff --git a/test.js b/test.js index 2e0bead..7e5053b 100644 --- a/test.js +++ b/test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var Joi = require('joi'); +var Joi = require('@hapi/joi'); var joiObjectId = require('./'); describe('joi-objectid', function() { @@ -33,10 +33,10 @@ describe('joi-objectid', function() { , { val: { length: 24 } , pass: false } ] - var schema = { val: oid() }; + var schema = oid(); tests.forEach(function(test) { - var res = Joi.validate({ val: test.val }, schema); + var res = schema.validate(test.val); assert(test.pass === ! res.error, res.error); }); @@ -45,7 +45,8 @@ describe('joi-objectid', function() { it('includes custom message for invalid value', function(done) { var dbId = joiObjectId(Joi, 'database id'); - var result = Joi.validate('blah', dbId()); + var schema = dbId(); + var result = schema.validate('blah'); assert(result.error); assert(result.error.message.indexOf('database id') >= 0);