Merge branch 'master' into feature/add-is-shown-to-model-collapse

README.md

@@ -22,7 +22,7 @@ The OpenAPI Specification has undergone 5 revisions since initial creation in 20
 
 Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
 ------------------ | ------------ | -------------------------- | -----
-3.13.0 | 2018-03-16 | 2.0, 3.0 | [tag v3.13.0](https://github.com/swagger-api/swagger-ui/tree/v3.13.0)
+3.12.1 | 2018-03-09 | 2.0, 3.0 | [tag v3.12.1](https://github.com/swagger-api/swagger-ui/tree/v3.12.1)
 3.0.21 | 2017-07-26 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21)
 2.2.10 | 2017-01-04 | 1.1, 1.2, 2.0 | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10)
 2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5)

docs/usage/configuration.md

@@ -59,7 +59,6 @@ Parameter Name | Description
 `operationsSorter` | `Function=(a => a)`. Apply a sort to the operation list of each API. It can be 'alpha' (sort by paths alphanumerically), 'method' (sort by HTTP method) or a function (see Array.prototype.sort() to know how sort function works). Default is the order returned by the server unchanged.
 `showExtensions` | `Boolean=false`. Controls the display of vendor extension (`x-`) fields and values for Operations, Parameters, and Schema.
 `tagsSorter` | `Function=(a => a)`. Apply a sort to the tag list of each API. It can be 'alpha' (sort by paths alphanumerically) or a function (see [Array.prototype.sort()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort) to learn how to write a sort function). Two tag name strings are passed to the sorter for each pass. Default is the order determined by Swagger-UI.
-`onComplete` | `Function=NOOP`. Provides a mechanism to be notified when Swagger-UI has finished rendering a newly provided definition.
 
 ##### Network
 
@@ -78,11 +77,3 @@ Parameter Name | Description
 --- | ---
 `modelPropertyMacro` | `Function`. Function to set default values to each property in model. Accepts one argument modelPropertyMacro(property), property is immutable
 `parameterMacro` | `Function`. Function to set default value to parameters. Accepts two arguments parameterMacro(operation, parameter). Operation and parameter are objects passed for context, both remain immutable
-
-### Instance methods
-
-Method Name | Description
---- | ---
-`initOAuth` | `(configObj) => void`. Provide Swagger-UI with information about your OAuth server - see the OAuth2 documentation for more information.
-`preauthorizeBasic` | `(authDefinitionKey, username, password) => action`. Programmatically set values for a Basic authorization scheme.
-`preauthorizeApiKey` | `(authDefinitionKey, apiKeyValue) => action`. Programmatically set values for an API key authorization scheme.

docs/usage/oauth2.md

@@ -1,5 +1,7 @@
 # OAuth2 configuration
-You can configure OAuth2 authorization by calling the `initOAuth` method.
+You can configure OAuth2 authorization by calling `initOAuth` method with passed configs under the instance of `SwaggerUIBundle`
+default `client_id` and `client_secret`, `realm`, an application name `appName`, `scopeSeparator`, `additionalQueryStringParams`,
+`useBasicAuthenticationWithAccessCodeGrant`.
 
 Config Name | Description
 --- | ---
@@ -9,7 +11,7 @@ realm | realm query parameter (for oauth1) added to `authorizationUrl` and `toke
 appName | application name, displayed in authorization popup. MUST be a string
 scopeSeparator | scope separator for passing scopes, encoded before calling, default value is a space (encoded value `%20`). MUST be a string
 additionalQueryStringParams | Additional query parameters added to `authorizationUrl` and `tokenUrl`. MUST be an object
-useBasicAuthenticationWithAccessCodeGrant | Only activated for the `accessCode` flow.  During the `authorization_code` request to the `tokenUrl`, pass the [Client Password](https://tools.ietf.org/html/rfc6749#section-2.3.1) using the HTTP Basic Authentication scheme (`Authorization` header with `Basic base64encode(client_id + client_secret)`).  The default is `false`
+useBasicAuthenticationWithAccessCodeGrant | Only activated for the `accessCode` flow.  During the `authorization_code` request to the `tokenUrl`, pass the [Client Password](https://tools.ietf.org/html/rfc6749#section-2.3.1) using the HTTP Basic Authentication scheme (`Authorization` header with `Basic base64encoded[client_id:client_secret]`).  The default is `false`
 
 ```javascript
 const ui = SwaggerUI({...})

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-ui",
-  "version": "3.13.0",
+  "version": "3.12.1",
   "main": "dist/swagger-ui.js",
   "repository": "git@github.com:swagger-api/swagger-ui.git",
   "contributors": [
@@ -37,8 +37,7 @@
     "test-e2e": "sleep 3 && nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json",
     "e2e-initial-render": "nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json --group initial-render",
     "mock-api": "json-server --watch test/e2e/db.json --port 3204",
-    "hot-e2e-server": "webpack-dev-server --content-base test/e2e/helpers --host 0.0.0.0 --config webpack-hot-dev-server.config.js --inline --hot --progress",
-    "e2e": "npm-run-all --parallel -r hot-e2e-server mock-api test-e2e"
+    "e2e": "npm-run-all --parallel -r hot-server mock-api test-e2e"
   },
   "dependencies": {
     "@braintree/sanitize-url": "^2.0.2",

src/core/components/info.jsx

@@ -5,7 +5,7 @@ import ImPropTypes from "react-immutable-proptypes"
 import { sanitizeUrl } from "core/utils"
 
 
-export class InfoBasePath extends React.Component {
+class Path extends React.Component {
   static propTypes = {
     host: PropTypes.string,
     basePath: PropTypes.string
@@ -68,17 +68,6 @@ class License extends React.Component {
   }
 }
 
-export class InfoUrl extends React.PureComponent {
-  static propTypes = {
-    url: PropTypes.string.isRequired
-  }
-
-  render() {
-    const { url } = this.props
-    return <a target="_blank" href={ sanitizeUrl(url) }><span className="url"> { url } </span></a>
-  }
-}
-
 export default class Info extends React.Component {
   static propTypes = {
     info: PropTypes.object,
@@ -101,8 +90,6 @@ export default class Info extends React.Component {
 
     const Markdown = getComponent("Markdown")
     const VersionStamp = getComponent("VersionStamp")
-    const InfoUrl = getComponent("InfoUrl")
-    const InfoBasePath = getComponent("InfoBasePath")
 
     return (
       <div className="info">
@@ -110,8 +97,8 @@ export default class Info extends React.Component {
           <h2 className="title" >{ title }
             { version && <VersionStamp version={version}></VersionStamp> }
           </h2>
-          { host || basePath ? <InfoBasePath host={ host } basePath={ basePath } /> : null }
-          { url && <InfoUrl url={url} /> }
+          { host || basePath ? <Path host={ host } basePath={ basePath } /> : null }
+          { url && <a target="_blank" href={ sanitizeUrl(url) }><span className="url"> { url } </span></a> }
         </hgroup>
 
         <div className="description">

src/core/components/models.jsx

@@ -54,8 +54,9 @@ export default class Models extends Component {
           definitions.entrySeq().map( ( [ name ])=>{
 
             const schema = specSelectors.specResolvedSubtree([...specPathBase, name])
+            const isShown = layoutSelectors.isShown(["models", name], false)
 
-            if(layoutSelectors.isShown(["models", name], false) && schema === undefined) {
+            if(isShown && schema === undefined) {
               // Firing an action in a container render is not great,
               // but it works for now.
               this.props.specActions.requestResolvedSubtree([...this.getSchemaBasePath(), name])
@@ -63,7 +64,7 @@ export default class Models extends Component {
 
             const content = <ModelWrapper name={ name }
               expandDepth={ defaultModelsExpandDepth }
-              schema={ schema  || Im.Map() }
+              schema={ schema }
               specPath={Im.List([...specPathBase, name])}
               getComponent={ getComponent }
               specSelectors={ specSelectors }
@@ -83,7 +84,7 @@ export default class Models extends Component {
                 title={title}
                 modelName={name}
                 hideSelfOnExpand={true}
-                expanded={defaultModelsExpandDepth > 1}
+                expanded={isShown || defaultModelsExpandDepth > 1 }
                 >{content}</ModelCollapse>
               </div>
           }).toArray()

src/core/plugins/auth/index.js

@@ -8,8 +8,6 @@ export default function() {
     afterLoad(system) {
       this.rootInjects = this.rootInjects || {}
       this.rootInjects.initOAuth = system.authActions.configureAuth
-      this.rootInjects.preauthorizeApiKey = preauthorizeApiKey.bind(null, system)
-      this.rootInjects.preauthorizeBasic = preauthorizeBasic.bind(null, system)
     },
     statePlugins: {
       auth: {
@@ -23,50 +21,3 @@ export default function() {
     }
   }
 }
-
-export function preauthorizeBasic(system, key, username, password) {
-  const {
-    authActions: { authorize },
-    specSelectors: { specJson, isOAS3 }
-  } = system
-
-  const definitionBase = isOAS3() ? ["components", "securitySchemes"] : ["securityDefinitions"]
-
-  const schema = specJson().getIn([...definitionBase, key])
-
-  if(!schema) {
-    return null
-  }
-
-  return authorize({
-    [key]: {
-      value: {
-        username,
-        password,
-      },
-      schema: schema.toJS()
-    }
-  })
-}
-
-export function preauthorizeApiKey(system, key, value) {
-  const {
-    authActions: { authorize },
-    specSelectors: { specJson, isOAS3 }
-  } = system
-
-  const definitionBase = isOAS3() ? ["components", "securitySchemes"] : ["securityDefinitions"]
-
-  const schema = specJson().getIn([...definitionBase, key])
-
-  if(!schema) {
-    return null
-  }
-
-  return authorize({
-    [key]: {
-      value,
-      schema: schema.toJS()
-    }
-  })
-}

src/core/plugins/download-url.js

@@ -2,7 +2,6 @@
 
 import { createSelector } from "reselect"
 import { Map } from "immutable"
-import win from "../window"
 
 export default function downloadUrlPlugin (toolbox) {
   let { fn } = toolbox
@@ -13,7 +12,6 @@ export default function downloadUrlPlugin (toolbox) {
       const config = getConfigs()
       url = url || specSelectors.url()
       specActions.updateLoadingStatus("loading")
-      errActions.clear({source: "fetch"})
       fetch({
         url,
         loadSpec: true,
@@ -28,10 +26,7 @@ export default function downloadUrlPlugin (toolbox) {
       function next(res) {
         if(res instanceof Error || res.status >= 400) {
           specActions.updateLoadingStatus("failed")
-          errActions.newThrownErr(Object.assign( new Error((res.message || res.statusText) + " " + url), {source: "fetch"}))
-          // Check if the failure was possibly due to CORS or mixed content
-          if (!res.status && res instanceof Error) checkPossibleFailReasons()
-          return
+          return errActions.newThrownErr( new Error((res.message || res.statusText) + " " + url) )
         }
         specActions.updateLoadingStatus("success")
         specActions.updateSpec(res.text)
@@ -40,38 +35,6 @@ export default function downloadUrlPlugin (toolbox) {
         }
       }
 
-      function checkPossibleFailReasons() {
-        try {
-          let specUrl
-
-          if("URL" in win ) {
-            specUrl = new URL(url)
-          } else {
-            // legacy browser, use <a href> to parse the URL
-            specUrl = document.createElement("a")
-            specUrl.href = url
-          }
-
-          if(specUrl.protocol !== "https:" && win.location.protocol === "https:") {
-            const error = Object.assign(
-              new Error(`Possible mixed-content issue? The page was loaded over https:// but a ${specUrl.protocol}// URL was specified. Check that you are not attempting to load mixed content.`),
-              {source: "fetch"}
-            )
-            errActions.newThrownErr(error)
-            return
-          }
-          if(specUrl.origin !== win.location.origin) {
-            const error = Object.assign(
-              new Error(`Possible cross-origin (CORS) issue? The URL origin (${specUrl.origin}) does not match the page (${win.location.origin}). Check the server returns the correct 'Access-Control-Allow-*' headers.`),
-              {source: "fetch"}
-            )
-            errActions.newThrownErr(error)
-          }
-        } catch (e) {
-          return
-        }
-      }
-
     },
 
     updateLoadingStatus: (status) => {

src/core/plugins/on-complete/index.js

@@ -1,28 +0,0 @@
-let engaged = false
-
-export default function() {
-
-  return {
-    statePlugins: {
-      spec: {
-        wrapActions: {
-          updateSpec: (ori) => (...args) => {
-            engaged = true
-            return ori(...args)
-          },
-          updateJsonSpec: (ori, system) => (...args) => {
-            const cb = system.getConfigs().onComplete
-            if(engaged && typeof cb === "function") {
-              // call `onComplete` on next tick, which allows React to
-              // reconcile the DOM before we notify the user
-              setTimeout(cb, 0)
-              engaged = false
-            }
-
-            return ori(...args)
-          }
-        }
-      }
-    }
-  }
-}

src/core/plugins/samples/fn.js

@@ -29,10 +29,6 @@ export const sampleFromSchema = (schema, config={}) => {
   let { type, example, properties, additionalProperties, items } = objectify(schema)
   let { includeReadOnly, includeWriteOnly } = config
 
-  if(example && example.$$ref) {
-    delete example.$$ref
-  }
-
   if(example !== undefined)
     return example
 

src/core/presets/base.js

@@ -13,7 +13,6 @@ import downloadUrlPlugin from "core/plugins/download-url"
 import configsPlugin from "core/plugins/configs"
 import deepLinkingPlugin from "core/plugins/deep-linking"
 import filter from "core/plugins/filter"
-import onComplete from "core/plugins/on-complete"
 
 import OperationContainer from "core/containers/OperationContainer"
 
@@ -46,10 +45,7 @@ import Headers from "core/components/headers"
 import Errors from "core/components/errors"
 import ContentType from "core/components/content-type"
 import Overview from "core/components/overview"
-import Info, {
-  InfoUrl,
-  InfoBasePath
-} from "core/components/info"
+import Info from "core/components/info"
 import Footer from "core/components/footer"
 import ParamBody from "core/components/param-body"
 import Curl from "core/components/curl"
@@ -128,9 +124,7 @@ export default function() {
       OperationExtRow,
       ParameterExt,
       OperationContainer,
-      DeepLink,
-      InfoUrl,
-      InfoBasePath
+      DeepLink
     }
   }
 
@@ -160,7 +154,6 @@ export default function() {
     SplitPaneModePlugin,
     downloadUrlPlugin,
     deepLinkingPlugin,
-    filter,
-    onComplete
+    filter
   ]
 }

src/standalone/layout.jsx

@@ -21,7 +21,6 @@ export default class StandaloneLayout extends React.Component {
     let Container = getComponent("Container")
     let Row = getComponent("Row")
     let Col = getComponent("Col")
-    let Errors = getComponent("errors", true)
 
     const Topbar = getComponent("Topbar", true)
     const BaseLayout = getComponent("BaseLayout", true)
@@ -46,8 +45,8 @@ export default class StandaloneLayout extends React.Component {
           <div className="info">
             <div className="loading-container">
               <h4 className="title">Failed to load API definition.</h4>
-              <Errors/>
-            </div>
+              <p>{lastErrMsg}</p>
+            </div>            
           </div>
         }
         { loadingStatus === "failedConfig" &&

test/core/plugins/auth/preauthorize.js

@@ -1,154 +0,0 @@
-/* eslint-env mocha */
-import expect from "expect"
-import { fromJS } from "immutable"
-import { preauthorizeBasic, preauthorizeApiKey } from "corePlugins/auth"
-import { authorize } from "corePlugins/auth/actions"
-
-const S2_SYSTEM = {
-  authActions: {
-    authorize
-  },
-  specSelectors: {
-    isOAS3: () => false,
-    specJson: () => {
-      return fromJS({
-        swagger: "2.0",
-        securityDefinitions: {
-          "APIKeyHeader": {
-            "type": "apiKey",
-            "in": "header",
-            "name": "X-API-Key"
-          },
-          "basicAuth": {
-            "type": "basic"
-          }
-        }
-      })
-    }
-  }
-}
-
-const OAI3_SYSTEM = {
-  authActions: {
-    authorize
-  },
-  specSelectors: {
-    isOAS3: () => true,
-    specJson: () => {
-      return fromJS({
-        openapi: "3.0.0",
-        components: {
-          securitySchemes: {
-            basicAuth: {
-              type: "http",
-              scheme: "basic"
-            },
-            APIKeyHeader: {
-              type: "apiKey",
-              in: "header",
-              name: "X-API-Key"
-            }
-          }
-        }
-      })
-    }
-  }
-}
-
-describe("auth plugin - preauthorizers", () => {
-  describe("preauthorizeBasic", () => {
-    it("should return a valid authorize action in Swagger 2", () => {
-      const res = preauthorizeBasic(S2_SYSTEM, "basicAuth", "user", "pass")
-
-      expect(res).toEqual({
-        type: "authorize",
-        payload: {
-          basicAuth: {
-            schema: {
-              type: "basic"
-            },
-            value: {
-              username: "user",
-              password: "pass"
-            }
-          }
-        }
-      })
-    })
-    it("should return a valid authorize action in OpenAPI 3", () => {
-      const res = preauthorizeBasic(OAI3_SYSTEM, "basicAuth", "user", "pass")
-
-      expect(res).toEqual({
-        type: "authorize",
-        payload: {
-          basicAuth: {
-            schema: {
-              type: "http",
-              scheme: "basic"
-            },
-            value: {
-              username: "user",
-              password: "pass"
-            }
-          }
-        }
-      })
-    })
-    it("should return null when the authorization name is invalid in Swagger 2", () => {
-      const res = preauthorizeBasic(S2_SYSTEM, "fakeBasicAuth", "user", "pass")
-
-      expect(res).toEqual(null)
-    })
-    it("should return null when the authorization name is invalid in OpenAPI 3", () => {
-      const res = preauthorizeBasic(OAI3_SYSTEM, "fakeBasicAuth", "user", "pass")
-
-      expect(res).toEqual(null)
-    })
-  })
-  describe("preauthorizeApiKey", () => {
-    it("should return a valid authorize action in Swagger 2", () => {
-      const res = preauthorizeApiKey(S2_SYSTEM, "APIKeyHeader", "Asdf1234")
-
-      expect(res).toEqual({
-        type: "authorize",
-        payload: {
-          APIKeyHeader: {
-            schema: {
-              type: "apiKey",
-              name: "X-API-Key",
-              "in": "header"
-            },
-            value: "Asdf1234"
-          }
-        }
-      })
-    })
-    it("should return a valid authorize action in OpenAPI 3", () => {
-      const res = preauthorizeApiKey(OAI3_SYSTEM, "APIKeyHeader", "Asdf1234")
-
-      expect(res).toEqual({
-        type: "authorize",
-        payload: {
-          APIKeyHeader: {
-            schema: {
-              type: "apiKey",
-              "in": "header",
-              name: "X-API-Key"
-            },
-            value: "Asdf1234"
-          }
-        }
-      })
-    })
-    it("should return null when the authorization name is invalid in Swagger 2", () => {
-      const res = preauthorizeApiKey(S2_SYSTEM, "FakeAPIKeyHeader", "Asdf1234")
-
-      expect(res).toEqual(null)
-    })
-    it("should return null when the authorization name is invalid in OpenAPI 3", () => {
-      const res = preauthorizeApiKey(OAI3_SYSTEM, "FakeAPIKeyHeader", "Asdf1234")
-
-      expect(res).toEqual(null)
-    })
-  })
-})

test/core/system/system.js

@@ -701,36 +701,6 @@ describe("bound system", function(){
     })
   })
 
-  describe("rootInjects", function() {
-    it("should attach a rootInject function as an instance method", function() {
-      // This is the same thing as the `afterLoad` tests, but is here for posterity
-      
-      // Given
-      const system = new System({
-        plugins: [
-          {
-            afterLoad(system) {
-              this.rootInjects.wow = system.dogeSelectors.wow
-            },
-            statePlugins: {
-              doge: {
-                selectors: {
-                  wow: () => (system) => {
-                    return "so selective"
-                  }
-                }
-              }
-            }
-          }
-        ]
-      })
-
-      // When
-      var res = system.getSystem().wow()
-      expect(res).toEqual("so selective")
-    })
-  })
-
   describe("error catching", function() {
     it("should encapsulate thrown errors in an afterLoad method", function() {
       // Given

test/e2e/helpers/index.html

@@ -1,111 +0,0 @@
-<!-- HTML for dev server -->
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Swagger UI</title>
-  <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
-  <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
-  <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
-  <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
-  <style>
-    html
-    {
-      box-sizing: border-box;
-      overflow: -moz-scrollbars-vertical;
-      overflow-y: scroll;
-    }
-    *,
-    *:before,
-    *:after
-    {
-      box-sizing: inherit;
-    }
-    body {
-      margin:0;
-      background: #fafafa;
-    }
-  </style>
-</head>
-
-<body>
-
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
-  <defs>
-    <symbol viewBox="0 0 20 20" id="unlocked">
-      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="locked">
-      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="close">
-      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="large-arrow">
-      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="large-arrow-down">
-      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
-    </symbol>
-
-
-    <symbol viewBox="0 0 24 24" id="jump-to">
-      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 24 24" id="expand">
-      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
-    </symbol>
-
-  </defs>
-</svg>
-
-<div id="swagger-ui"></div>
-
-<script src="./swagger-ui-bundle.js"> </script>
-<script src="./swagger-ui-standalone-preset.js"> </script>
-<script>
-  window.onload = function() {
-    window["SwaggerUIBundle"] = window["swagger-ui-bundle"]
-    window["SwaggerUIStandalonePreset"] = window["swagger-ui-standalone-preset"]
-    // Build a system
-    const ui = SwaggerUIBundle({
-      url: "http://petstore.swagger.io/v2/swagger.json",
-      dom_id: '#swagger-ui',
-      presets: [
-        SwaggerUIBundle.presets.apis,
-        SwaggerUIStandalonePreset
-      ],
-      plugins: [
-        SwaggerUIBundle.plugins.DownloadUrl
-      ],
-      layout: "StandaloneLayout",
-      onComplete: () => {
-        if(window.completeCount) {
-          window.completeCount++
-        } else {
-          window.completeCount = 1
-        }
-      }
-    })
-
-    window.ui = ui
-
-    ui.initOAuth({
-      clientId: "your-client-id",
-      clientSecret: "your-client-secret-if-required",
-      realm: "your-realms",
-      appName: "your-app-name",
-      scopeSeparator: " ",
-      additionalQueryStringParams: {}
-    })
-  }
-</script>
-</body>
-
-</html>

test/e2e/scenarios/on-complete.js

@@ -1,22 +0,0 @@
-const expect = require("expect")
-
-describe("onComplete option", function () {
-  let mainPage
-  beforeEach(function (client, done) {
-    mainPage = client
-      .url("localhost:3200")
-      .page.main()
-
-    client.waitForElementVisible(".opblock-tag-section", 5000)
-    done()
-  })
-
-  it("triggers the page-provided onComplete exactly 1 times", function (client, done) {
-    client.execute(function() {
-      return window.completeCount
-    }, [], (result) => {
-      expect(result.value).toEqual(1)
-      client.end()
-    })
-  })
-})

webpack-hot-dev-server.config.js

@@ -63,6 +63,7 @@ module.exports = require("./make-webpack-config")(rules, {
   },
   devServer: {
     port: 3200,
+    contentBase: path.join(__dirname, "dev-helpers"),
     publicPath: "/",
     noInfo: true,
     hot: true,