Skip to content

Commit f26d25a

Browse files
committed
Migrate enum test schema.
Add doc directory to lint script execution.
1 parent b0f7281 commit f26d25a

File tree

12 files changed

+37
-21
lines changed

12 files changed

+37
-21
lines changed

Diff for: .jscsrc

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"test/spec.js",
1616
"node_modules",
1717
"coverage",
18-
"doc",
1918
"async-validate.js"
2019
]
2120
}

Diff for: .jshintignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node_modules
22
test/spec.js
33
coverage
4-
doc
54
async-validate.js

Diff for: doc/example/additional.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ var Schema = require('../..')
1212
fields: {
1313
street: {type: 'string', required: true},
1414
city: {type: 'string', required: true},
15-
zip: {type: 'string', required: true, len: 8, message: 'Invalid zip'}
15+
zip: {
16+
type: 'string',
17+
required: true,
18+
len: 8,
19+
message: 'Invalid zip'
20+
}
1621
}
1722
}
1823
}
@@ -24,7 +29,7 @@ var Schema = require('../..')
2429
name: 'unknown-field',
2530
street: 'Mock St',
2631
city: 'Mock City',
27-
zip: '12345678',
32+
zip: '12345678'
2833
}
2934
}
3035
, schema;

Diff for: doc/example/match.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ var Schema = require('../..')
33
, descriptor = {
44
type: 'object',
55
required: true,
6-
//fields: {
7-
all: {
8-
match: /./,
9-
type: 'string'
10-
}
11-
//}
6+
all: {
7+
match: /./,
8+
type: 'string'
9+
}
1210
}
1311
, source = {address1: 'foo', address2: 'bar', address3: false}
1412
, schema;

Diff for: doc/example/max.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ var Schema = require('../..')
55
func: {type: 'function', required: true, max: 1}
66
}
77
}
8-
, source = {func: function noop(foo, bar){}}
8+
, source = {
9+
func: function noop(foo, bar){
10+
foo();
11+
bar();
12+
}
13+
}
914
, schema;
1015

1116
require('../../plugin/all');

Diff for: doc/example/message-function.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var Schema = require('../..')
55
name: {
66
type: 'string',
77
required: true,
8-
message: function(msg, parameters) {
8+
message: function() {
99
return this.format(
1010
'name must be specified (field: %s)', this.field);
1111
}

Diff for: doc/example/placeholder.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ var Schema = require('../..')
1717
require('../../plugin/all');
1818

1919
schema = new Schema(descriptor);
20-
schema.validate(source, function(err, res) {
20+
schema.validate(source, function() {
2121
console.dir(source);
2222
});

Diff for: doc/example/range.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ var Schema = require('../..')
55
func: {type: 'function', required: true, min: 1, max: 2}
66
}
77
}
8-
, source = {func: function noop(foo, bar, qux){}}
8+
, source = {
9+
func: function noop(foo, bar, qux){
10+
foo();
11+
bar();
12+
qux();
13+
}
14+
}
915
, schema;
1016

1117
require('../../plugin/all');

Diff for: doc/example/state.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// pass state information between rule test functions
22
var Schema = require('../..')
3-
, url = require('url')
43
, dns = require('dns')
54
, state = {}
65
, opts = {state: state}

Diff for: doc/transform.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ Schema.plugin([
1717
require('../plugin/util')
1818
]);
1919

20-
schema.validate(source, function(err, res) {
20+
schema.validate(source, function() {
2121
console.dir(source.name);
2222
});

Diff for: test/fixtures/schema/enum.js

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
var schema = {
2+
type: 'object',
3+
fields: {
4+
role: {type: 'enum', list: ['admin', 'user', 'guest']}
5+
}
6+
}
7+
8+
module.exports = schema;

Diff for: test/spec/enum.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
var expect = require('chai').expect
2-
, Schema = require('../../index');
2+
, Schema = require('../../index')
3+
, descriptor = require('../fixtures/schema/enum');
34

45
describe('async-validate:', function() {
56

6-
var descriptor = {
7-
role: {type: 'enum', list: ['admin', 'user', 'guest']}
8-
}
9-
107
it('should error on invalid enum value', function(done) {
118
var schema = new Schema(descriptor);
129
schema.validate({role: 'manager'}, function(err, res) {

0 commit comments

Comments
 (0)