fix: prevent object inheritance mutations in recursive sampleXmlFromSchema calls (via #5034)
* fix: prevent object inheritance mutations in recursive sampleXmlFromSchema calls * fix unrelated test
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import { objectify, isFunc, normalizeArray, deeplyStripKey } from "core/utils"
|
||||
import XML from "@kyleshockey/xml"
|
||||
import memoizee from "memoizee"
|
||||
import deepAssign from "@kyleshockey/object-assign-deep"
|
||||
|
||||
const primitives = {
|
||||
"string": () => "string",
|
||||
@@ -120,7 +121,7 @@ export const inferSchema = (thing) => {
|
||||
|
||||
|
||||
export const sampleXmlFromSchema = (schema, config={}) => {
|
||||
let objectifySchema = objectify(schema)
|
||||
let objectifySchema = deepAssign({}, objectify(schema))
|
||||
let { type, properties, additionalProperties, items, example } = objectifySchema
|
||||
let { includeReadOnly, includeWriteOnly } = config
|
||||
let defaultValue = objectifySchema.default
|
||||
|
||||
@@ -244,9 +244,12 @@ describe("sampleFromSchema", function() {
|
||||
format: "date-time"
|
||||
}
|
||||
|
||||
var expected = new Date().toISOString()
|
||||
// 0-20 chops off milliseconds
|
||||
// necessary because test latency can cause failures
|
||||
// it would be better to mock Date globally and expect a string - KS 11/18
|
||||
var expected = new Date().toISOString().substring(0, 20)
|
||||
|
||||
expect(sampleFromSchema(definition)).toEqual(expected)
|
||||
expect(sampleFromSchema(definition)).toInclude(expected)
|
||||
})
|
||||
|
||||
it("returns example value for date property", function() {
|
||||
@@ -969,6 +972,43 @@ describe("createXMLExample", function () {
|
||||
expect(sut(definition)).toEqual(expected)
|
||||
})
|
||||
|
||||
it("returns array of objects with example values with wrapped=true", function () {
|
||||
var expected = `<?xml version="1.0" encoding="UTF-8"?>\n<users>\n\t<user>\n\t\t<id>1</id>\n\t\t<name>Arthur Dent</name>\n\t</user>\n\t<user>\n\t\t<id>2</id>\n\t\t<name>Ford Prefect</name>\n\t</user>\n</users>`
|
||||
var definition = {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"id": {
|
||||
"type": "integer"
|
||||
},
|
||||
"name": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "user"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "users",
|
||||
"wrapped": true
|
||||
},
|
||||
"example": [
|
||||
{
|
||||
"id": 1,
|
||||
"name": "Arthur Dent"
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"name": "Ford Prefect"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
expect(sut(definition)).toEqual(expected)
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
describe("object", function () {
|
||||
|
||||
Reference in New Issue
Block a user