lib/test: update code for mgl-validate v2.x+

lib/plugins/validate.js

@@ -17,15 +17,11 @@ function ValidatePlugin(rail, options) {
     breakOnError: options.breakOnError === false ? false : true
   });
 
-  var i, err;
+  var i;
 
   if (options.schemas) {
     for (i = 0; i < options.schemas.length; ++i) {
-      err = this.registry.addSchema(options.schemas[i]);
-
-      if (err) {
-        throw err;
-      }
+      this.registry.addSchema(options.schemas[i]);
     }
   }
 
@@ -105,24 +101,45 @@ ValidatePlugin.prototype._interceptResponse = function(call, options, response)
 
 
 ValidatePlugin.prototype._validate = function(schema, data) {
-  var err, id;
+  var result, err, id;
 
   if (typeof schema === 'string') {
     return this.registry.test(schema, data);
 
   } else if (typeof schema === 'object') {
     id = schema.id;
 
-    err = this.registry.addSchema(schema);
+    err = this._addSchema(schema);
+
     if (err) {
       return err;
     }
 
-    err = this.registry.test(id, data);
+    result = this.registry.test(id, data);
+
+    if (result) {
+      err = new Error('Validation failed');
+      err.validation = JSON.stringify(result);
+      err.validation = result;
+    }
+
+    // technically this could throw
     this.registry.removeSchema(id);
+
     return err;
 
   } else {
     return new Error('Invalid schema');
   }
 };
+
+
+ValidatePlugin.prototype._addSchema = function(schema) {
+  try {
+    this.registry.addSchema(schema);
+  } catch (e) {
+    return e;
+  }
+
+  return;
+};

test/test-http-validate.js

@@ -223,7 +223,7 @@ suite('http:validate', function() {
       }
     }).on('error', function(err) {
       assert(err);
-      assert.strictEqual(err.message, 'Invalid schema id');
+      assert.strictEqual(err.message, 'Missing schema id');
       done();
     }).end();
   });