Migrate deep test schemas.

Author: tmpfs

test/fixtures/schema/deep-array.js

@@ -0,0 +1,15 @@
+var schema = {
+  type: 'object',
+  fields: {
+    roles: {
+      type: 'array', required: true, len: 3,
+      fields: {
+        0: {type: 'string', required: true},
+        1: {type: 'string', required: true},
+        2: {type: 'string', required: true}
+      }
+    }
+  }
+}
+
+module.exports = schema;

test/fixtures/schema/deep-details.js

@@ -0,0 +1,17 @@
+var schema = {
+  type: 'object',
+  fields: {
+    name: {type: 'string', required: true},
+    address: {
+      type: 'object',
+      required: true,
+      fields: {
+        street: {type: 'string', required: true},
+        city: {type: 'string', required: true},
+        zip: {type: 'string', required: true, len: 8, message: 'invalid zip'}
+      }
+    }
+  }
+}
+
+module.exports = schema;

test/fixtures/schema/deep-object.js

@@ -0,0 +1,21 @@
+var schema = {
+  type: 'object',
+  fields: {
+    address: {
+      type: 'object',
+      required: true,
+      fields: {
+        house: {
+          type: 'object',
+          required: true,
+          fields: {
+            name: {type: 'string', required: true},
+            number: {type: 'string', required: true}
+          }
+        }
+      }
+    }
+  }
+}
+
+module.exports = schema;

test/fixtures/schema/deep-required.js

@@ -0,0 +1,16 @@
+var schema = {
+  type: 'object',
+  fields: {
+    address: {
+      type: 'object',
+      required: true,
+      fields: {
+        street: {type: 'string', required: true},
+        city: {type: 'string', required: true},
+        zip: {type: 'string', required: true, len: 8, message: 'Invalid zip'}
+      }
+    }
+  }
+}
+
+module.exports = schema;

test/fixtures/schema/deep.js

@@ -0,0 +1,15 @@
+var schema = {
+  type: 'object',
+  fields: {
+    address: {
+      type: 'object',
+      fields: {
+        street: {type: 'string', required: true},
+        city: {type: 'string', required: true},
+        zip: {type: 'string', required: true, len: 8, message: 'Invalid zip'}
+      }
+    }
+  }
+}
+
+module.exports = schema;

test/spec/deep.js

@@ -1,66 +1,13 @@
 var expect = require('chai').expect
-  , Schema = require('../../index');
+  , Schema = require('../../index')
+  , descriptor = require('../fixtures/schema/deep')
+  , required = require('../fixtures/schema/deep-required')
+  , details = require('../fixtures/schema/deep-details')
+  , arrayFields = require('../fixtures/schema/deep-array')
+  , deepObject = require('../fixtures/schema/deep-object');
 
 describe('async-validate:', function() {
 
-  var descriptor = {
-    address: {
-      type: 'object',
-      fields: {
-        street: {type: 'string', required: true},
-        city: {type: 'string', required: true},
-        zip: {type: 'string', required: true, len: 8, message: 'Invalid zip'}
-      }
-    }
-  }
-
-  var required = {
-    address: {
-      type: 'object', required: true,
-      fields: {
-        street: {type: 'string', required: true},
-        city: {type: 'string', required: true},
-        zip: {type: 'string', required: true, len: 8, message: 'Invalid zip'}
-      }
-    }
-  }
-
-  var details = {
-    name: {type: 'string', required: true},
-    address: {
-      type: 'object',
-      required: true,
-      fields: {
-        street: {type: 'string', required: true},
-        city: {type: 'string', required: true},
-        zip: {type: 'string', required: true, len: 8, message: 'invalid zip'}
-      }
-    }
-  }
-
-  //it('should error on deep rule (with bail out options)', function(done) {
-    //var descriptor = {
-      //name: {type: 'string', required: true},
-      //address: {
-        //type: 'object', required: true, options: {single: true, first: true},
-        //fields: {
-          //street: {type: 'string', required: true},
-          //city: {type: 'string', required: true},
-          //zip: {type: 'string', required: true, len: 8, message: 'invalid zip'}
-        //}
-      //}
-    //}
-    //var schema = new Schema(descriptor);
-    //schema.validate({address: {}}, function(err, res) {
-      //expect(res.errors.length).to.eql(2);
-      //expect(res.errors[0].message).to.eql('name is required');
-      //expect(res.errors[1].message).to.eql('street is required');
-      ////expect(res.errors[2].message).to.eql('city is required');
-      ////expect(res.errors[3].message).to.eql('invalid zip');
-      //done();
-    //});
-  //});
-
   it('should error on invalid deep rule (required/no matching property)',
     function(done) {
       var schema = new Schema(required);
@@ -72,7 +19,7 @@ describe('async-validate:', function() {
     }
   );
 
-  it('should error on invalid deep rule (required and validation failure on deep rule)',
+  it('should error on invalid deep rule (required and failure on deep rule)',
     function(done) {
       var schema = new Schema(details);
       schema.validate({ address: {} }, function(err, res) {
@@ -87,17 +34,7 @@ describe('async-validate:', function() {
   );
 
   it('should error on deep rule (array type length mismatch)', function(done) {
-    var descriptor = {
-      roles: {
-        type: 'array', required: true, len: 3,
-        fields: {
-          0: {type: 'string', required: true},
-          1: {type: 'string', required: true},
-          2: {type: 'string', required: true}
-        }
-      }
-    }
-    var schema = new Schema(descriptor);
+    var schema = new Schema(arrayFields);
     schema.validate({ roles: ['admin', 'user'] }, function(err, res) {
       expect(res.errors.length).to.eql(2);
       expect(res.errors[0].message).to.eql('roles must be exactly 3 in length');
@@ -107,23 +44,7 @@ describe('async-validate:', function() {
   });
 
   it('should error on invalid multiple deep rule', function(done) {
-
-    var descriptor = {
-      address: {
-        type: 'object', required: true,
-        fields: {
-          house: {
-            type: 'object', required: true,
-            fields: {
-              name: {type: 'string', required: true},
-              number: {type: 'string', required: true}
-            }
-          }
-        }
-      }
-    }
-
-    var schema = new Schema(descriptor);
+    var schema = new Schema(deepObject);
     schema.validate({ address: {house: {}} }, function(err, res) {
       expect(res.errors.length).to.eql(2);
       expect(res.errors[0].message).to.eql('name is required');
@@ -144,17 +65,7 @@ describe('async-validate:', function() {
   );
 
   it('should validate deep rule (array type)', function(done) {
-    var descriptor = {
-      roles: {
-        type: 'array', required: true, len: 3,
-        fields: {
-          0: {type: 'string', required: true},
-          1: {type: 'string', required: true},
-          2: {type: 'string', required: true}
-        }
-      }
-    }
-    var schema = new Schema(descriptor)
+    var schema = new Schema(arrayFields)
       , source = {roles: ['admin', 'user', 'guest']};
     schema.validate(source, function(err, res) {
       expect(err).to.eql(null);
@@ -163,5 +74,4 @@ describe('async-validate:', function() {
     });
   });
 
-
 });