models: include model's `description`
This commit is contained in:
parent
dc815a8421
commit
060354cff8
|
@ -90,6 +90,7 @@ var modelHelper = module.exports = {
|
||||||
|
|
||||||
out[name] = {
|
out[name] = {
|
||||||
id: name,
|
id: name,
|
||||||
|
description: typeConverter.convertText(def.description),
|
||||||
properties: properties,
|
properties: properties,
|
||||||
required: required
|
required: required
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var modelHelper = require('../lib/model-helper');
|
var modelHelper = require('../lib/model-helper');
|
||||||
var _assign = require('lodash.assign');
|
var _defaults = require('lodash.defaults');
|
||||||
var loopback = require('loopback');
|
var loopback = require('loopback');
|
||||||
var expect = require('chai').expect;
|
var expect = require('chai').expect;
|
||||||
|
|
||||||
|
@ -139,6 +139,11 @@ describe('model-helper', function() {
|
||||||
var nameProp = def.properties.name;
|
var nameProp = def.properties.name;
|
||||||
expect(nameProp).to.have.property('description', 'a-description');
|
expect(nameProp).to.have.property('description', 'a-description');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('converts model field `description`', function() {
|
||||||
|
var def = buildSwaggerModels({}, { description: 'a-description' });
|
||||||
|
expect(def).to.have.property('description', 'a-description');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('related models', function() {
|
describe('related models', function() {
|
||||||
|
@ -212,23 +217,27 @@ describe('model-helper', function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
// Simulates the format of a remoting class.
|
// Simulates the format of a remoting class.
|
||||||
function buildSwaggerModels(model) {
|
function buildSwaggerModels(modelProperties, modelOptions) {
|
||||||
var aClass = createModelCtor(model);
|
var aClass = createModelCtor(modelProperties, modelOptions);
|
||||||
return modelHelper.generateModelDefinition(aClass.ctor, {}).testModel;
|
return modelHelper.generateModelDefinition(aClass.ctor, {}).testModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
function createModelCtor(properties) {
|
function createModelCtor(properties, modelOptions) {
|
||||||
Object.keys(properties).forEach(function(name) {
|
Object.keys(properties).forEach(function(name) {
|
||||||
var type = properties[name];
|
var type = properties[name];
|
||||||
if (typeof type !== 'object' || Array.isArray(type))
|
if (typeof type !== 'object' || Array.isArray(type))
|
||||||
properties[name] = { type: type };
|
properties[name] = { type: type };
|
||||||
});
|
});
|
||||||
var aClass = {
|
|
||||||
ctor: {
|
var definition = {
|
||||||
definition: {
|
|
||||||
name: 'testModel',
|
name: 'testModel',
|
||||||
properties: properties
|
properties: properties
|
||||||
}
|
};
|
||||||
|
_defaults(definition, modelOptions);
|
||||||
|
|
||||||
|
var aClass = {
|
||||||
|
ctor: {
|
||||||
|
definition: definition
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return aClass;
|
return aClass;
|
||||||
|
|
Loading…
Reference in New Issue