Skip to content

Commit d4ee76e

Browse files
mikunnPhil Sturgeon
authored andcommitted
Create separate test helpers file
1 parent 974e871 commit d4ee76e

12 files changed

+47
-42
lines changed

index.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@ function convertSchema(schema) {
6464
return schema;
6565
}
6666

67+
function validateType(type) {
68+
const validTypes = ['null', 'boolean', 'object', 'array', 'number', 'string', 'integer'];
69+
const types = Array.isArray(type) ? type : [type];
70+
types.forEach(type => {
71+
if (validTypes.indexOf(type) < 0 && type !== undefined)
72+
throw new InvalidTypeError('Type "' + type + '" is not a valid type');
73+
});
74+
}
75+
6776
function convertProperties(properties) {
6877
var key
6978
, property
File renamed without changes.
File renamed without changes.

test/complex_schemas.js renamed to test/complex_schemas.test.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
const convert = require('../');
44
const should = require('should');
5-
const fs = require('fs');
6-
const join = require('path').join;
5+
const getSchema = require('./helpers').getSchema;
76

87
it('complex schema', () => {
98
const schema = getSchema('json-schema-expected.json');
@@ -21,8 +20,3 @@ it('converting complex schema in place', () => {
2120
should(schema).deepEqual(result, 'changed schema in place');
2221
should(result).deepEqual(expected, 'converted');
2322
});
24-
25-
function getSchema(file) {
26-
const path = join(__dirname, 'schemas', file);
27-
return JSON.parse(fs.readFileSync(path));
28-
}

test/helpers.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
const fs = require('fs');
2+
const join = require('path').join;
3+
4+
const getSchema = file => {
5+
const path = join(__dirname, 'schemas', file);
6+
return JSON.parse(fs.readFileSync(path));
7+
};
8+
9+
module.exports = { getSchema };

test/invalid_types.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

test/invalid_types.test.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
'use strict';
2+
3+
const convert = require('../');
4+
const should = require('should');
5+
const getSchema = require('./helpers').getSchema;
6+
7+
it('invalid types', () => {
8+
var schema, msg;
9+
10+
schema = {
11+
type: 'dateTime'
12+
};
13+
14+
msg = 'dateTime is invalid type';
15+
should.throws(() => { convert(schema); }, /InvalidTypeError/, msg);
16+
17+
schema = {
18+
type: 'foo'
19+
};
20+
21+
msg = 'foo is invalid type';
22+
should.throws(() => { convert(schema); }, /InvalidTypeError/, msg);
23+
24+
schema = getSchema('schema-2-invalid-type.json');
25+
26+
msg = 'invalid type inside complex schema';
27+
should.throws(() => { convert(schema); }, /InvalidTypeError.*invalidtype/, msg);
28+
});
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)