kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: path-item $ref produces/consumes inheritance (via #5049)

Browse Source 
* implement a selector for consumes options

* fix incorrect comment, test names

* add `consumesOptionsFor` selector

* use `consumesOptionsFor` and drop `operationConsumes`
This commit is contained in:
kyle
2018-11-23 23:24:11 +01:00
committed by GitHub
parent 2977c93840
commit 971c6f7536
7 changed files with 400 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

293
test/core/plugins/spec/selectors.js
View File

@@ -7,7 +7,7 @@ import {
contentTypeValues,
operationScheme,
specJsonWithResolvedSubtrees,
operationConsumes
producesOptionsFor,
} from "corePlugins/spec/selectors"
import Petstore from "./assets/petstore.json"
@@ -15,7 +15,8 @@ import {
operationWithMeta,
parameterWithMeta,
parameterWithMetaByIdentity,
parameterInclusionSettingFor
parameterInclusionSettingFor,
consumesOptionsFor
} from "../../../../src/core/plugins/spec/selectors"
describe("spec plugin - selectors", function(){
@@ -253,34 +254,6 @@ describe("spec plugin - selectors", function(){
})
describe("operationConsumes", function(){
it("should return the operationConsumes for an operation", function(){
// Given
let state = fromJS({
json: {
paths: {
"/one": {
get: {
consumes: [
"application/xml",
"application/something-else"
]
}
}
}
}
})
// When
let contentTypes = operationConsumes(state, [ "/one", "get" ])
// Then
expect(contentTypes.toJS()).toEqual([
"application/xml",
"application/something-else"
])
})
})
describe("operationScheme", function(){
it("should return the correct scheme for a remote spec that doesn't specify a scheme", function(){
@@ -751,4 +724,264 @@ describe("spec plugin - selectors", function(){
expect(result).toEqual(true)
})
})
describe("producesOptionsFor", function() {
it("should return an operation produces value", function () {
const state = fromJS({
json: {
paths: {
"/": {
"get": {
description: "my operation",
produces: [
"operation/one",
"operation/two",
]
}
}
}
}
})
const result = producesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"operation/one",
"operation/two",
])
})
it("should return a path item produces value", function () {
const state = fromJS({
json: {
paths: {
"/": {
"get": {
description: "my operation",
produces: [
"path-item/one",
"path-item/two",
]
}
}
}
}
})
const result = producesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"path-item/one",
"path-item/two",
])
})
it("should return a global produces value", function () {
const state = fromJS({
json: {
produces: [
"global/one",
"global/two",
],
paths: {
"/": {
"get": {
description: "my operation"
}
}
}
}
})
const result = producesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"global/one",
"global/two",
])
})
it("should favor an operation produces value over a path-item value", function () {
const state = fromJS({
json: {
paths: {
"/": {
produces: [
"path-item/one",
"path-item/two",
],
"get": {
description: "my operation",
produces: [
"operation/one",
"operation/two",
]
}
}
}
}
})
const result = producesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"operation/one",
"operation/two",
])
})
it("should favor a path-item produces value over a global value", function () {
const state = fromJS({
json: {
produces: [
"global/one",
"global/two",
],
paths: {
"/": {
produces: [
"path-item/one",
"path-item/two",
],
"get": {
description: "my operation"
}
}
}
}
})
const result = producesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"path-item/one",
"path-item/two",
])
})
})
describe("consumesOptionsFor", function() {
it("should return an operation consumes value", function () {
const state = fromJS({
json: {
paths: {
"/": {
"get": {
description: "my operation",
consumes: [
"operation/one",
"operation/two",
]
}
}
}
}
})
const result = consumesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"operation/one",
"operation/two",
])
})
it("should return a path item consumes value", function () {
const state = fromJS({
json: {
paths: {
"/": {
"get": {
description: "my operation",
consumes: [
"path-item/one",
"path-item/two",
]
}
}
}
}
})
const result = consumesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"path-item/one",
"path-item/two",
])
})
it("should return a global consumes value", function () {
const state = fromJS({
json: {
consumes: [
"global/one",
"global/two",
],
paths: {
"/": {
"get": {
description: "my operation"
}
}
}
}
})
const result = consumesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"global/one",
"global/two",
])
})
it("should favor an operation consumes value over a path-item value", function () {
const state = fromJS({
json: {
paths: {
"/": {
consumes: [
"path-item/one",
"path-item/two",
],
"get": {
description: "my operation",
consumes: [
"operation/one",
"operation/two",
]
}
}
}
}
})
const result = consumesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"operation/one",
"operation/two",
])
})
it("should favor a path-item consumes value over a global value", function () {
const state = fromJS({
json: {
consumes: [
"global/one",
"global/two",
],
paths: {
"/": {
consumes: [
"path-item/one",
"path-item/two",
],
"get": {
description: "my operation"
}
}
}
}
})
const result = consumesOptionsFor(state, ["/", "get"])
expect(result.toJS()).toEqual([
"path-item/one",
"path-item/two",
])
})
})
})