#1248 createXMLSample handle prefix and names in xml
This commit is contained in:
9
dist/swagger-ui.js
vendored
9
dist/swagger-ui.js
vendored
@@ -26833,8 +26833,17 @@ SwaggerUi.partials.signature = (function () {
|
|||||||
};
|
};
|
||||||
var type = definition.type;
|
var type = definition.type;
|
||||||
var format = definition.format;
|
var format = definition.format;
|
||||||
|
var xml = definition.xml || {};
|
||||||
var value;
|
var value;
|
||||||
|
|
||||||
|
if (xml.name) {
|
||||||
|
name = xml.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (xml.prefix) {
|
||||||
|
name = xml.prefix + ':' + name;
|
||||||
|
}
|
||||||
|
|
||||||
if (_.keys(primitivesMap).indexOf(type) !== -1) {
|
if (_.keys(primitivesMap).indexOf(type) !== -1) {
|
||||||
if (type === 'string') {
|
if (type === 'string') {
|
||||||
value = format ? primitivesMap.string[format] : primitivesMap.string.default;
|
value = format ? primitivesMap.string[format] : primitivesMap.string.default;
|
||||||
|
|||||||
2
dist/swagger-ui.min.js
vendored
2
dist/swagger-ui.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -666,8 +666,17 @@ SwaggerUi.partials.signature = (function () {
|
|||||||
};
|
};
|
||||||
var type = definition.type;
|
var type = definition.type;
|
||||||
var format = definition.format;
|
var format = definition.format;
|
||||||
|
var xml = definition.xml || {};
|
||||||
var value;
|
var value;
|
||||||
|
|
||||||
|
if (xml.name) {
|
||||||
|
name = xml.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (xml.prefix) {
|
||||||
|
name = xml.prefix + ':' + name;
|
||||||
|
}
|
||||||
|
|
||||||
if (_.keys(primitivesMap).indexOf(type) !== -1) {
|
if (_.keys(primitivesMap).indexOf(type) !== -1) {
|
||||||
if (type === 'string') {
|
if (type === 'string') {
|
||||||
value = format ? primitivesMap.string[format] : primitivesMap.string.default;
|
value = format ? primitivesMap.string[format] : primitivesMap.string.default;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ describe('SwaggerUi.partials.signature tests', function () {
|
|||||||
var date = new Date(1).toISOString().split('T')[0];
|
var date = new Date(1).toISOString().split('T')[0];
|
||||||
var dateTime = new Date(1).toISOString();
|
var dateTime = new Date(1).toISOString();
|
||||||
|
|
||||||
describe('simple types', function () {
|
describe('simple types with no xml property', function () {
|
||||||
it('returns tag <tagname>string</tagname> when passing type string', function () {
|
it('returns tag <tagname>string</tagname> when passing type string', function () {
|
||||||
var name = 'tagname';
|
var name = 'tagname';
|
||||||
var definition = {type: 'string'};
|
var definition = {type: 'string'};
|
||||||
@@ -43,12 +43,51 @@ describe('SwaggerUi.partials.signature tests', function () {
|
|||||||
expect(sut.createXMLSample(name, definition)).to.equal('<tagname>' + date + '</tagname>');
|
expect(sut.createXMLSample(name, definition)).to.equal('<tagname>' + date + '</tagname>');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('returns tag <tagname>' + dateTime + '</tagname> when passing type boolean format date-time', function () {
|
it('returns tag <tagname>' + dateTime + '</tagname> when passing type string format date-time', function () {
|
||||||
var name = 'tagname';
|
var name = 'tagname';
|
||||||
var definition = {type: 'string', format: 'date-time'};
|
var definition = {type: 'string', format: 'date-time'};
|
||||||
|
|
||||||
expect(sut.createXMLSample(name, definition)).to.equal('<tagname>' + dateTime + '</tagname>');
|
expect(sut.createXMLSample(name, definition)).to.equal('<tagname>' + dateTime + '</tagname>');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('simple types with xml property', function () {
|
||||||
|
it('returns tag <newtagname>string</newtagname> when passing type string and xml:{name: "newtagname"}', function () {
|
||||||
|
var name = 'tagname';
|
||||||
|
var definition = {
|
||||||
|
type: 'string',
|
||||||
|
xml: {
|
||||||
|
name: 'newtagname'
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(sut.createXMLSample(name, definition)).to.equal('<newtagname>string</newtagname>');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns tag <test:newtagname>string</test:newtagname> when passing type string and xml:{name: "newtagname", prefix:"test"}', function () {
|
||||||
|
var name = 'tagname';
|
||||||
|
var definition = {
|
||||||
|
type: 'string',
|
||||||
|
xml: {
|
||||||
|
name: 'newtagname',
|
||||||
|
prefix: 'test'
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(sut.createXMLSample(name, definition)).to.equal('<test:newtagname>string</test:newtagname>');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns tag <test:tagname>string</test:tagname> when passing type string and xml:{name: "newtagname", prefix:"test"}', function () {
|
||||||
|
var name = 'tagname';
|
||||||
|
var definition = {
|
||||||
|
type: 'string',
|
||||||
|
xml: {
|
||||||
|
prefix: 'test'
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(sut.createXMLSample(name, definition)).to.equal('<test:tagname>string</test:tagname>');
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user