cleanup tests

Author: felixheck

src/utils.js

@@ -12,15 +12,17 @@ const scheme = joi.object({
   clientId: joi.string().min(1).required(),
   secret: joi.string().min(1),
   publicKey: joi.string().regex(/^-----BEGIN(?: RSA)? PUBLIC KEY-----[\s\S]*-----END(?: RSA)? PUBLIC KEY-----$/ig, 'PEM'),
-  verifyOpts: joi.object().unknown(true),
+  verifyOpts: joi.object({
+    ignoreExpiration: joi.any().forbidden(),
+    ignoreNotBefore: joi.any().forbidden()
+  }).unknown(true),
   cache: joi.alternatives().try(joi.object({
     segment: joi.string().default('keycloakJwt')
   }), joi.boolean()).default(false),
   userInfo: joi.array().items(joi.string().min(1))
 })
 .xor('secret', 'publicKey')
 .without('secret', 'verifyOpts')
-.forbidden('verifyOpts.ignoreExpiration', 'verifyOpts.ignoreNotBefore')
 .required()
 
 /**

test/_helpers.js

@@ -44,6 +44,20 @@ function mock (code, data, isError) {
   isError ? base.replyWithError(data) : base.reply(code, data)
 }
 
+/**
+ * @function
+ * @public
+ *
+ * Log the option name with the asserted value.
+ *
+ * @param {string} option The name of the option
+ * @param {*} value The value to be asserted
+ * @returns {string} The aggregated log message
+ */
+function log (option, value) {
+  return `${option}: ${value && value.toString()}`
+}
+
 /**
  * @function
  * @private
@@ -144,7 +158,8 @@ function getServer (options, done) {
 
 module.exports = {
   getOptions,
+  mock,
+  log,
   getServer,
-  registerPlugin,
-  mock
+  registerPlugin
 }

test/utils.spec.js

@@ -43,7 +43,7 @@ test('throw error if options are empty', (t) => {
   t.throws(() => utils.verify({}), Error)
 })
 
-test('throw error if options are invalid – client.realmUrl', (t) => {
+test('throw error if options are invalid – realmUrl', (t) => {
   const invalids = [
     null,
     undefined,
@@ -63,11 +63,11 @@ test('throw error if options are invalid – client.realmUrl', (t) => {
   invalids.forEach((invalid) => {
     t.throws(() => utils.verify(helpers.getOptions({
       realmUrl: invalid
-    })), Error)
+    })), Error, helpers.log('realmUrl', invalid))
   })
 })
 
-test('throw error if options are invalid – client.clientId', (t) => {
+test('throw error if options are invalid – clientId', (t) => {
   const invalids = [
     null,
     undefined,
@@ -86,11 +86,11 @@ test('throw error if options are invalid – client.clientId', (t) => {
   invalids.forEach((invalid) => {
     t.throws(() => utils.verify(helpers.getOptions({
       clientId: invalid
-    })), Error)
+    })), Error, helpers.log('clientId', invalid))
   })
 })
 
-test('throw error if options are invalid – client.secret', (t) => {
+test('throw error if options are invalid – secret', (t) => {
   const invalids = [
     null,
     undefined,
@@ -109,7 +109,7 @@ test('throw error if options are invalid – client.secret', (t) => {
   invalids.forEach((invalid) => {
     t.throws(() => utils.verify(helpers.getOptions({
       secret: invalid
-    })), Error)
+    })), Error, helpers.log('secret', invalid))
   })
 })
 
@@ -128,7 +128,7 @@ test('throw error if options are invalid – cache', (t) => {
   invalids.forEach((invalid) => {
     t.throws(() => utils.verify(helpers.getOptions({
       cache: invalid
-    })), Error)
+    })), Error, helpers.log('cache', invalid))
   })
 })
 
@@ -160,7 +160,7 @@ test('throw error if options are invalid – userInfo', (t) => {
   invalids.forEach((invalid) => {
     t.throws(() => utils.verify(helpers.getOptions({
       userInfo: invalid
-    })), Error)
+    })), Error, helpers.log('userInfo', invalid))
   })
 })
 
@@ -178,6 +178,8 @@ test('throw no error if options are valid', (t) => {
   t.plan(valids.length)
 
   valids.forEach((valid) => {
-    t.notThrows(() => utils.verify(helpers.getOptions(valid)), Error)
+    t.notThrows(
+      () => utils.verify(helpers.getOptions(valid)),
+      Error, helpers.log('valid', valid))
   })
 })