Merge branch 'master' into feature/xml-cdata-implementation

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-ui",
-  "version": "3.19.2",
+  "version": "3.19.3",
   "main": "dist/swagger-ui.js",
   "repository": "git@github.com:swagger-api/swagger-ui.git",
   "contributors": [
@@ -48,6 +48,7 @@
   "dependencies": {
     "@braintree/sanitize-url": "^2.0.2",
     "@kyleshockey/js-yaml": "^1.0.1",
+    "@kyleshockey/object-assign-deep": "^0.4.2",
     "base64-js": "^1.2.0",
     "classnames": "^2.2.5",
     "core-js": "^2.5.1",

src/core/system.js

@@ -4,6 +4,7 @@ import Im, { fromJS, Map } from "immutable"
 import deepExtend from "deep-extend"
 import { combineReducers } from "redux-immutable"
 import serializeError from "serialize-error"
+import assignDeep from "@kyleshockey/object-assign-deep"
 import { NEW_THROWN_ERR } from "corePlugins/err/actions"
 import win from "core/window"
 
@@ -310,11 +311,13 @@ export default class Store {
 }
 
 function combinePlugins(plugins, toolbox) {
-  if(isObject(plugins) && !isArray(plugins))
-    return plugins
+  if(isObject(plugins) && !isArray(plugins)) {
+    return assignDeep({}, plugins)
+  }
 
-  if(isFunc(plugins))
+  if(isFunc(plugins)) {
     return combinePlugins(plugins(toolbox), toolbox)
+  }
 
   if(isArray(plugins)) {
     return plugins

test/core/system/wrapComponent.js

@@ -190,4 +190,58 @@ describe("wrapComponents", () => {
     expect(children.eq(0).text()).toEqual("Original component")
     expect(children.eq(1).text()).toEqual("WOW much data")
   })
+
+  it("should wrap correctly when building a system twice", function(){
+
+    // Given
+
+    const pluginOne = {
+      statePlugins: {
+        doge: {
+          selectors: {
+            wow: () => () => {
+              return "WOW much data"
+            }
+          }
+        }
+      },
+      components: {
+        wow: () => <div>Original component</div>
+      }
+    }
+
+    const pluginTwo = {
+      // Wrap the component and use the system
+      wrapComponents: {
+        wow: (OriginalComponent, system) => (props) => {
+          return <container>
+            <OriginalComponent {...props}></OriginalComponent>
+            <div>{system.dogeSelectors.wow()}</div>
+          </container>
+        }
+      }
+    }
+
+    const bothPlugins = () => [pluginOne, pluginTwo]
+
+    new System({
+      plugins: bothPlugins
+    })
+
+    const secondSystem = new System({
+      plugins: bothPlugins
+    })
+
+    // Then
+    var Component = secondSystem.getSystem().getComponents("wow")
+    const wrapper = render(<Component name="Normal" />)
+
+    const container = wrapper.children().first()
+    expect(container[0].name).toEqual("container")
+
+    const children = container.children()
+    expect(children.length).toEqual(2)
+    expect(children.eq(0).text()).toEqual("Original component")
+    expect(children.eq(1).text()).toEqual("WOW much data")
+  })
 })

test/e2e-cypress/static/documents/petstore-expanded.openapi.yaml

@@ -0,0 +1,155 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: Swagger Petstore
+  description: A sample API that uses a petstore as an example to demonstrate features in the OpenAPI 3.0 specification
+  termsOfService: http://swagger.io/terms/
+  contact:
+    name: Swagger API Team
+    email: apiteam@swagger.io
+    url: http://swagger.io
+  license:
+    name: Apache 2.0
+    url: https://www.apache.org/licenses/LICENSE-2.0.html
+servers:
+  - url: http://petstore.swagger.io/api
+paths:
+  /pets:
+    get:
+      description: |
+        Returns all pets from the system that the user has access to
+        Nam sed condimentum est. Maecenas tempor sagittis sapien, nec rhoncus sem sagittis sit amet. Aenean at gravida augue, ac iaculis sem. Curabitur odio lorem, ornare eget elementum nec, cursus id lectus. Duis mi turpis, pulvinar ac eros ac, tincidunt varius justo. In hac habitasse platea dictumst. Integer at adipiscing ante, a sagittis ligula. Aenean pharetra tempor ante molestie imperdiet. Vivamus id aliquam diam. Cras quis velit non tortor eleifend sagittis. Praesent at enim pharetra urna volutpat venenatis eget eget mauris. In eleifend fermentum facilisis. Praesent enim enim, gravida ac sodales sed, placerat id erat. Suspendisse lacus dolor, consectetur non augue vel, vehicula interdum libero. Morbi euismod sagittis libero sed lacinia.
+
+        Sed tempus felis lobortis leo pulvinar rutrum. Nam mattis velit nisl, eu condimentum ligula luctus nec. Phasellus semper velit eget aliquet faucibus. In a mattis elit. Phasellus vel urna viverra, condimentum lorem id, rhoncus nibh. Ut pellentesque posuere elementum. Sed a varius odio. Morbi rhoncus ligula libero, vel eleifend nunc tristique vitae. Fusce et sem dui. Aenean nec scelerisque tortor. Fusce malesuada accumsan magna vel tempus. Quisque mollis felis eu dolor tristique, sit amet auctor felis gravida. Sed libero lorem, molestie sed nisl in, accumsan tempor nisi. Fusce sollicitudin massa ut lacinia mattis. Sed vel eleifend lorem. Pellentesque vitae felis pretium, pulvinar elit eu, euismod sapien.
+      operationId: findPets
+      parameters:
+        - name: tags
+          in: query
+          description: tags to filter by
+          required: false
+          style: form
+          schema:
+            type: array
+            items:
+              type: string
+        - name: limit
+          in: query
+          description: maximum number of results to return
+          required: false
+          schema:
+            type: integer
+            format: int32
+      responses:
+        '200':
+          description: pet response
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+    post:
+      description: Creates a new pet in the store.  Duplicates are allowed
+      operationId: addPet
+      requestBody:
+        description: Pet to add to the store
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/NewPet'
+      responses:
+        '200':
+          description: pet response
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+  /pets/{id}:
+    get:
+      description: Returns a user based on a single ID, if the user does not have access to the pet
+      operationId: find pet by id
+      parameters:
+        - name: id
+          in: path
+          description: ID of pet to fetch
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: pet response
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+    delete:
+      description: deletes a single pet based on the ID supplied
+      operationId: deletePet
+      parameters:
+        - name: id
+          in: path
+          description: ID of pet to delete
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '204':
+          description: pet deleted
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+components:
+  schemas:
+    Pet:
+      allOf:
+        - $ref: '#/components/schemas/NewPet'
+        - required:
+          - id
+          properties:
+            id:
+              type: integer
+              format: int64
+
+    NewPet:
+      required:
+        - name  
+      properties:
+        name:
+          type: string
+        tag:
+          type: string    
+
+    Error:
+      required:
+        - code
+        - message
+      properties:
+        code:
+          type: integer
+          format: int32
+        message:
+          type: string

test/e2e-cypress/tests/bugs/4865.js

@@ -0,0 +1,19 @@
+describe("#4865: multiple invocations + OAS3 plugin", () => {
+  it("control: should render the OAS3 badge correctly", () => {
+    // This is a sanity check to make sure the badge is present.
+    // If this is failing, it's probably not related to #4865.
+    cy.visit("/?url=/documents/petstore-expanded.openapi.yaml")
+      .get("#swagger-ui")
+      .get("pre.version")
+      .contains("OAS3")
+  })
+
+  it("test: should render the OAS3 badge correctly after re-initializing the UI", () => {
+    cy.visit("/?url=/documents/petstore-expanded.openapi.yaml")
+      .window()
+      .then(win => win.onload()) // re-initializes Swagger UI
+      .get("#swagger-ui")
+      .get("pre.version")
+      .contains("OAS3")
+  })
+})