Merge branch 'release/1.2.3' into production
This commit is contained in:
commit
11f89e14e9
|
@ -79,12 +79,14 @@ var modelHelper = module.exports = {
|
|||
out.type = modelHelper.getPropType(out.type);
|
||||
|
||||
if (out.type === 'array') {
|
||||
var arrayProp = prop.type[0];
|
||||
if (!arrayProp.type) arrayProp = {type: arrayProp};
|
||||
out.items = modelHelper.LDLPropToSwaggerDataType(arrayProp);
|
||||
}
|
||||
var hasItemType = typeof prop.type !== 'string' && prop.type.length;
|
||||
|
||||
if (out.type === 'date') {
|
||||
if (hasItemType) {
|
||||
var arrayProp = prop.type[0];
|
||||
if (!arrayProp.type) arrayProp = {type: arrayProp};
|
||||
out.items = modelHelper.LDLPropToSwaggerDataType(arrayProp);
|
||||
}
|
||||
} else if (out.type === 'date') {
|
||||
out.type = 'string';
|
||||
out.format = 'date';
|
||||
} else if (out.type === 'buffer') {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "loopback-explorer",
|
||||
"version": "1.2.2",
|
||||
"version": "1.2.3",
|
||||
"description": "Browse and test your LoopBack app's APIs",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
|
|
@ -80,6 +80,22 @@ describe('model-helper', function() {
|
|||
type: 'string', format: 'date'
|
||||
}});
|
||||
});
|
||||
|
||||
it('converts [] type', function() {
|
||||
var def = getDefinition({
|
||||
array: []
|
||||
});
|
||||
var prop = def.properties.array;
|
||||
expect(prop).to.eql({ type: 'array' });
|
||||
});
|
||||
|
||||
it('converts "array" type', function() {
|
||||
var def = getDefinition({
|
||||
array: 'array'
|
||||
});
|
||||
var prop = def.properties.array;
|
||||
expect(prop).to.eql({ type: 'array' });
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue