v3.12.1 (#4311)

* v3.12.1

* Rebuild dist for v3.12.1

.travis.yml

@@ -15,7 +15,6 @@ before_deploy:
   - npm run build
 env:
   - DOCKER_IMAGE_NAME=swaggerapi/swagger-ui
-script: npm run test:ci
 deploy:
   - provider: npm
     email: apiteam@swagger.io
@@ -35,7 +34,7 @@ deploy:
       node: '6.9'
 after_success:
   - if [ $DOCKER_HUB_USERNAME ]; then
-      docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD;
+      docker login --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD;
 
       if [ ! -z "$TRAVIS_TAG" ]; then
         DOCKER_IMAGE_TAG=$TRAVIS_TAG;

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.11.0 | 2018-02-09 | 2.0, 3.0 | [tag v3.11.0](https://github.com/swagger-api/swagger-ui/tree/v3.11.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/customization/plug-points.md

@@ -0,0 +1,43 @@
+# Plug points
+
+Swagger-UI exposes most of its internal logic through the plugin system.
+
+Often, it is beneficial to override the core internals to achieve custom behavior.
+
+### Note: Semantic Versioning
+
+Swagger-UI's internal APIs are _not_ part of our public contract, which means that they can change without the major version changing.
+
+If your custom plugins wrap, extend, override, or consume any internal core APIs, we recommend specifying a specific minor version of Swagger-UI to use in your application, because they will _not_ change between patch versions.
+
+If you're installing Swagger-UI via NPM, for example, you can do this by using a tilde:
+
+```js
+{
+  "dependencies": {
+    "swagger-ui": "~3.11.0"
+  }
+}
+```
+
+### `fn.opsFilter`
+
+When using the `filter` option, tag names will be filtered by the user-provided value. If you'd like to customize this behavior, you can override the default `opsFilter` function.
+
+For example, you can implement a multiple-phrase filter:
+
+```js
+const MultiplePhraseFilterPlugin = function() {
+  return {
+    fn: {
+      opsFilter: (taggedOps, phrase) => {
+        const phrases = phrase.split(", ")
+
+        return taggedOps.filter((val, key) => {
+          return phrases.some(item => key.indexOf(item) > -1)
+        })
+      }
+    }
+  }
+}
+```

docs/customization/plugin-api.md

@@ -2,6 +2,22 @@
 
 A plugin is a function that returns an object - more specifically, the object may contain functions and components that augment and modify Swagger-UI's functionality.
 
+### Note: Semantic Versioning 
+
+Swagger-UI's internal APIs are _not_ part of our public contract, which means that they can change without the major version changing.
+
+If your custom plugins wrap, extend, override, or consume any internal core APIs, we recommend specifying a specific minor version of Swagger-UI to use in your application, because they will _not_ change between patch versions.
+
+If you're installing Swagger-UI via NPM, for example, you can do this by using a tilde:
+
+```js
+{
+  "dependencies": {
+    "swagger-ui": "~3.11.0"
+  }
+}
+```
+
 ### Format
 
 A plugin return value may contain any of these keys, where `stateKey` is a name for a piece of state:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-ui",
-  "version": "3.11.0",
+  "version": "3.12.1",
   "main": "dist/swagger-ui.js",
   "repository": "git@github.com:swagger-api/swagger-ui.git",
   "contributors": [
@@ -14,32 +14,30 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "npm run build:core && npm run build:bundle && npm run build:standalone",
-    "build:bundle": "webpack --config webpack-dist-bundle.config.js --colors",
-    "build:core": "webpack --config webpack-dist.config.js --colors",
-    "build:standalone": "webpack --config webpack-dist-standalone.config.js --colors",
-    "deps:check": "npm run deps:license && npm run deps:size",
-    "deps:license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv",
-    "deps:size": "webpack -p --config webpack.check.js --json | webpack-bundle-size-analyzer >| $npm_package_config_deps_check_dir/sizes.txt",
-    "dev": "npm-run-all --parallel hot-server open-localhost",
-    "hot-server": "webpack-dev-server --host 0.0.0.0 --config webpack-hot-dev-server.config.js --inline --hot --progress --content-base dev-helpers/",
-    "lint": "eslint --cache --ext '.js,.jsx' src test",
-    "lint:errors": "eslint --cache --quiet --ext '.js,.jsx' src test",
-    "lint:fix": "eslint --cache --ext '.js,.jsx' src test --fix",
-    "open-localhost": "node -e 'require(\"open\")(\"http://localhost:3200\")'",
+    "build": "npm run build-core && npm run build-bundle && npm run build-standalone",
+    "build-bundle": "webpack --config webpack-dist-bundle.config.js --colors",
+    "build-core": "webpack --config webpack-dist.config.js --colors",
+    "build-standalone": "webpack --config webpack-dist-standalone.config.js --colors",
     "predev": "npm install",
-    "test": "npm run lint:errors && npm run test:nodejs",
-    "test:ci": "npm-run-all lint:errors test:nodejs test:ci:e2e",
-    "test:browser": "karma start --config karma.conf.js",
-    "test:ci:e2e": "if [ \"$ENABLE_CI_E2E\" = \"true\" ]; then npm-run-all --parallel -r test:e2e:mock-api test:e2e:all:cbt; else exit 0; fi",
-    "test:coverage": "nyc npm run test:nodejs",
-    "test:e2e": "npm-run-all --parallel -r hot-server test:e2e:mock-api test:e2e:all",
-    "test:e2e:all": "sleep 3 && nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json",
-    "test:e2e:all:cbt": "sleep 3 && nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch-cbt.json",
-    "test:e2e:initial-render": "nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json --group initial-render",
-    "test:e2e:mock-api": "json-server --static test/e2e/specs --watch test/e2e/db.json --port 3204",
-    "test:nodejs": "mocha --recursive --compilers js:babel-core/register test/core test/components test/bugs test/swagger-ui-dist-package test/xss",
-    "watch": "webpack --config webpack-watch.config.js --watch --progress"
+    "dev": "npm-run-all --parallel hot-server open-localhost",
+    "watch": "webpack --config webpack-watch.config.js --watch --progress",
+    "open-localhost": "node -e 'require(\"open\")(\"http://localhost:3200\")'",
+    "hot-server": "webpack-dev-server --host 0.0.0.0 --config webpack-hot-dev-server.config.js --inline --hot --progress --content-base dev-helpers/",
+    "deps-license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv",
+    "deps-size": "webpack -p --config webpack.check.js --json | webpack-bundle-size-analyzer >| $npm_package_config_deps_check_dir/sizes.txt",
+    "deps-check": "npm run deps-license && npm run deps-size",
+    "lint": "eslint --cache --ext '.js,.jsx' src test",
+    "lint-errors": "eslint --cache --quiet --ext '.js,.jsx' src test",
+    "lint-fix": "eslint --cache --ext '.js,.jsx' src test --fix",
+    "test": "npm run lint-errors && npm run just-test-in-node",
+    "test-in-node": "npm run lint-errors && npm run just-test-in-node",
+    "just-test": "karma start --config karma.conf.js",
+    "just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/core test/components test/bugs test/swagger-ui-dist-package test/xss",
+    "just-check-coverage": "nyc npm run just-test-in-node",
+    "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",
+    "e2e": "npm-run-all --parallel -r hot-server mock-api test-e2e"
   },
   "dependencies": {
     "@braintree/sanitize-url": "^2.0.2",
@@ -85,7 +83,7 @@
     "scroll-to-element": "^2.0.0",
     "serialize-error": "2.0.0",
     "shallowequal": "0.2.2",
-    "swagger-client": "^3.5.0",
+    "swagger-client": "^3.5.1",
     "url-parse": "^1.1.8",
     "whatwg-fetch": "0.11.1",
     "worker-loader": "^0.7.1",
@@ -106,7 +104,6 @@
     "babel-preset-react": "^6.23.0",
     "babel-preset-stage-0": "^6.22.0",
     "babel-runtime": "^6.23.0",
-    "cbt_tunnels": "^0.3.0",
     "chromedriver": "^2.30.1",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "0.28.4",
@@ -147,6 +144,7 @@
     "standard": "^10.0.2",
     "standard-loader": "^6.0.1",
     "style-loader": "0.18.2",
+    "tachyons-sass": "^4.9.2",
     "url-loader": "0.5.9",
     "webpack": "^2.6.1",
     "webpack-bundle-size-analyzer": "^2.5.0"

src/core/components/array-model.jsx

@@ -46,7 +46,7 @@ export default class ArrayModel extends Component {
             properties.size ? properties.entrySeq().map( ( [ key, v ] ) => <Property key={`${key}-${v}`} propKey={ key } propVal={ v } propStyle={ propStyle } />) : null
           }
           {
-            !description ? null :
+            !description ? (properties.size ? <div className="markdown"></div> : null) :
               <Markdown source={ description } />
           }
           <span>

src/core/components/auth/auths.jsx

@@ -81,11 +81,11 @@ export default class Auths extends React.Component {
               }).toArray()
             }
             <div className="auth-btn-wrapper">
-              <Button className="btn modal-btn auth btn-done" onClick={ this.close }>Done</Button>
               {
                 nonOauthDefinitions.size === authorizedAuth.size ? <Button className="btn modal-btn auth" onClick={ this.logoutClick }>Logout</Button>
               : <Button type="submit" className="btn modal-btn auth authorize">Authorize</Button>
               }
+              <Button className="btn modal-btn auth btn-done" onClick={ this.close }>Close</Button>
             </div>
           </form>
         }

src/core/components/auth/oauth2.jsx

@@ -39,6 +39,13 @@ export default class Oauth2 extends React.Component {
     }
   }
 
+  close = (e) => {
+    e.preventDefault()
+    let { authActions } = this.props
+
+    authActions.showDefinitions(false)
+  }
+
   authorize =() => {
     let { authActions, errActions, getConfigs, authSelectors } = this.props
     let configs = getConfigs()
@@ -231,6 +238,7 @@ export default class Oauth2 extends React.Component {
         : <Button className="btn modal-btn auth authorize" onClick={ this.authorize }>Authorize</Button>
           )
         }
+          <Button className="btn modal-btn auth btn-done" onClick={ this.close }>Close</Button>
         </div>
 
       </div>

src/core/components/online-validator-badge.jsx

@@ -101,7 +101,7 @@ class ValidatorImage extends React.Component {
     if (this.state.error) {
       return <img alt={"Error"} />
     } else if (!this.state.loaded) {
-      return <img alt= {"Loading..."} />
+      return null
     }
     return <img src={this.props.src} alt={this.props.alt} />
   }

src/core/components/parameter-row.jsx

@@ -24,11 +24,18 @@ export default class ParameterRow extends Component {
 
     let { specSelectors, pathMethod, param } = props
     let defaultValue = param.get("default")
+    let xExampleValue = param.get("x-example")
     let parameter = specSelectors.parameterWithMeta(pathMethod, param.get("name"), param.get("in"))
     let value = parameter ? parameter.get("value") : ""
-    if ( defaultValue !== undefined && value === undefined ) {
-      this.onChangeWrapper(defaultValue)
+
+    if( param.get("in") !== "body" ) {
+      if ( xExampleValue !== undefined && value === undefined && specSelectors.isSwagger2() ) {
+        this.onChangeWrapper(xExampleValue)
+      } else if ( defaultValue !== undefined && value === undefined ) {
+        this.onChangeWrapper(defaultValue)
+      }
     }
+
   }
 
   componentWillReceiveProps(props) {

src/core/components/providers/markdown.jsx

@@ -46,6 +46,7 @@ const sanitizeOptions = {
         "td": [ "colspan" ],
         "*": [ "class" ]
     },
+    allowedSchemesByTag: { img: [ "http", "https", "data" ] },
     textFilter: function(text) {
         return text.replace(/"/g, "\"")
     }

src/core/plugins/oas3/components/request-body-editor.jsx

@@ -27,6 +27,7 @@ export default class RequestBodyEditor extends PureComponent {
 
     this.state = {
       isEditBox: false,
+      userDidModify: false,
       value: ""
     }
   }
@@ -59,6 +60,11 @@ export default class RequestBodyEditor extends PureComponent {
     this.onChange(this.sample(explicitMediaType))
   }
 
+  resetValueToSample = (explicitMediaType) => {
+    this.setState({ userDidModify: false })
+    this.setValueToSample(explicitMediaType)
+  }
+
   sample = (explicitMediaType) => {
     let { requestBody, mediaType } = this.props
     let schema = requestBody.getIn(["content", explicitMediaType || mediaType, "schema"]).toJS()
@@ -78,6 +84,7 @@ export default class RequestBodyEditor extends PureComponent {
     const isJson = /json/i.test(mediaType)
     const inputValue = isJson ? e.target.value.trim() : e.target.value
 
+    this.setState({ userDidModify: true })
     this.onChange(inputValue)
   }
 
@@ -87,13 +94,14 @@ export default class RequestBodyEditor extends PureComponent {
     let {
       isExecute,
       getComponent,
+      mediaType,
     } = this.props
 
     const Button = getComponent("Button")
     const TextArea = getComponent("TextArea")
     const HighlightCode = getComponent("highlightCode")
 
-    let { value, isEditBox } = this.state
+    let { value, isEditBox, userDidModify } = this.state
 
     return (
       <div className="body-param">
@@ -104,14 +112,18 @@ export default class RequestBodyEditor extends PureComponent {
                                value={ value }/>)
         }
         <div className="body-param-options">
-          {
-            !isExecute ? null
-                       : <div className="body-param-edit">
-                        <Button className={isEditBox ? "btn cancel body-param__example-edit" : "btn edit body-param__example-edit"}
-                                 onClick={this.toggleIsEditBox}>{ isEditBox ? "Cancel" : "Edit"}
-                         </Button>
-                         </div>
-          }
+          <div className="body-param-edit">
+            {
+              !isExecute ? null
+                         : <Button className={isEditBox ? "btn cancel body-param__example-edit" : "btn edit body-param__example-edit"}
+                                   onClick={this.toggleIsEditBox}>{ isEditBox ? "Cancel" : "Edit"}
+                           </Button>
+
+            }
+            { userDidModify &&
+              <Button className="btn ml3" onClick={() => { this.resetValueToSample(mediaType) }}>Reset</Button>
+            }
+          </div>
         </div>
 
       </div>

src/core/utils.js

@@ -350,7 +350,7 @@ export function extractFileNameFromContentDispositionHeader(value){
   if (responseFilename !== null && responseFilename.length > 1) {
     return responseFilename[1]
   }
-  return null  
+  return null
 }
 
 // PascalCase, aka UpperCamelCase
@@ -559,7 +559,7 @@ export const validateParam = (param, isXml, isOAS3 = false) => {
     } else if ( type === "array" ) {
       let itemType
 
-      if ( !value.count() ) { return errors }
+      if ( !listCheck || !value.count() ) { return errors }
 
       itemType = paramDetails.getIn(["items", "type"])
 

src/plugins/topbar/topbar.jsx

@@ -45,7 +45,10 @@ export default class Topbar extends React.Component {
   setSearch = (spec) => {
     let search = parseSearch()
     search["urls.primaryName"] = spec.name
-    window.location.search = serializeSearch(search)
+    const newUrl = `${window.location.protocol}//${window.location.host}${window.location.pathname}`
+    if(window && window.history && window.history.pushState) {
+      window.history.replaceState(null, "", `${newUrl}?${serializeSearch(search)}`)
+    }
   }
 
   setSelectedUrl = (selectedUrl) => {

src/style/_authorize.scss

@@ -21,6 +21,7 @@
     .authorize
     {
         padding-right: 20px;
+        margin-right: 10px;
     }
 }
 

src/style/main.scss

@@ -1,5 +1,6 @@
 .swagger-ui
 {
+    @import '~tachyons-sass/tachyons.scss';
     @import 'mixins';
     @import 'variables';
     @import 'colors';

test/components/markdown.js

@@ -24,6 +24,18 @@ describe("Markdown component", function() {
             const el = render(<Markdown source={str} />)
             expect(el.html()).toEqual(`<div class="markdown"><p><img src="http://image.source" title="Image title"></p>\n</div>`)
         })
+      
+        it("allows image elements with https scheme", function() {
+            const str = `![Image alt text](https://image.source "Image title")`
+            const el = render(<Markdown source={str} />)
+            expect(el.html()).toEqual(`<div class="markdown"><p><img src="https://image.source" title="Image title"></p>\n</div>`)
+        })
+
+        it("allows image elements with data scheme", function() {
+            const str = `<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==">`
+            const el = render(<Markdown source={str} />)
+            expect(el.html()).toEqual(`<div class="markdown"><p>` + str + `</p>\n</div>`)
+        })
 
         it("allows heading elements", function() {
             const str = `
@@ -51,6 +63,18 @@ describe("Markdown component", function() {
             expect(el.html()).toEqual(`<div class="renderedMarkdown"><div><p><img src="http://image.source" title="Image title"></p></div></div>`)
         })
 
+        it("allows image elements with https scheme", function() {
+            const str = `![Image alt text](https://image.source "Image title")`
+            const el = render(<OAS3Markdown source={str} />)
+            expect(el.html()).toEqual(`<div class="renderedMarkdown"><div><p><img src="https://image.source" title="Image title"></p></div></div>`)
+        })
+
+        it("allows image elements with data scheme", function() {
+            const str = `<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==">`
+            const el = render(<OAS3Markdown source={str} />)
+            expect(el.html()).toEqual(`<div class="renderedMarkdown"><div>` + str + `</div></div>`)
+        })
+
         it("allows heading elements", function() {
             const str = `
 # h1

test/e2e/cbt-globals.js

@@ -1,32 +0,0 @@
-/* eslint-disable no-console */
-var cbt = require("cbt_tunnels")
-
-
-module.exports = {
-  baseAppUrl: "http://swagger-ui-ci-asset-deployment-test.surge.sh",
-
-  // use rawgit.com to get test/e2e/specs/petstore.json from master
-  // not a great solution, but CBT's proxy is too slow to fetch
-  // the data directly.
-  specPath: "https://rawgit.com/swagger-api/swagger-ui/master/test/e2e/specs/petstore.json",
-  visibleTimeout: 10000,
-
-  before: function(done) {
-    console.log("Starting up tunnel")
-    cbt.start({
-      username: process.env.CBT_USERNAME || "",
-      authkey: process.env.CBT_AUTHKEY || ""
-    }, function(err, data) {
-      if (err) {
-        done(err)
-      } else {
-        done(data)
-      }
-    })
-  },
-  after: function(done) {
-    console.log("Closing Down Tunnel")
-    cbt.stop()
-    done()
-  }
-}

test/e2e/globals.js

@@ -1,6 +0,0 @@
-var cbt = require("cbt_tunnels")
-
-module.exports = {
-  baseAppUrl: "http://localhost:3200",
-  specPath: "http://localhost:3200/test-specs/petstore.json"
-}

test/e2e/nightwatch-cbt.json

@@ -1,57 +0,0 @@
-{
-  "src_folders" : ["test/e2e/scenarios"],
-  "output_folder" : "reports",
-  "live_output": true,
-  "custom_commands_path" : "",
-  "custom_assertions_path" : "",
-  "page_objects_path" : "test/e2e/pages",
-  "globals_path" : "test/e2e/cbt-globals.js",
-
-  "test_runner" : {
-    "type" : "mocha",
-    "options" : {
-      "ui" : "bdd",
-      "reporter" : "list"
-    }
-  },
-
-  "test_workers": {
-    "enabled": true,
-    "workers": 3
-  },
-
-  "selenium" : {
-    "start_process" : false,
-    "server_path" : "",
-    "log_path" : "",
-    "host" : "127.0.0.1",
-    "port" : 4444,
-    "cli_args" : {
-      "webdriver.chrome.driver" : "",
-      "webdriver.ie.driver" : ""
-    }
-  },
-
-  "test_settings" : {
-    "default" : {
-      "launch_url" : "http://localhost",
-      "selenium_port"  : 80,
-      "selenium_host"  : "hub.crossbrowsertesting.com",
-      "silent": true,
-      "screenshots" : {
-        "enabled" : false,
-        "path" : ""
-      },
-      "username": "${CBT_USERNAME}",
-      "access_key": "${CBT_AUTHKEY}",
-      "desiredCapabilities": {
-        "acceptSslCerts": "1",
-        "browserName": "chrome",
-        "javascriptEnabled": "1",
-        "record_network" : "true",
-        "record_video" : "true",
-        "max_duration": 1200
-      }
-    }
-  }
-}

test/e2e/nightwatch.json

@@ -5,7 +5,7 @@
   "custom_commands_path" : "",
   "custom_assertions_path" : "",
   "page_objects_path" : "test/e2e/pages",
-  "globals_path" : "test/e2e/globals.js",
+  "globals_path" : "",
   "test_workers" : {
     "enabled" : true,
     "workers" : "auto"
@@ -60,4 +60,4 @@
       }
     }
   }
-}
+}

test/e2e/pages/main.js

@@ -20,7 +20,7 @@ module.exports = {
         version: {
           selector: ".version"
         },
-        baseAppUrl: {
+        baseUrl: {
           selector: ".base-url"
         },
         mainUrl: {

test/e2e/scenarios/informationContainer.js

@@ -2,35 +2,35 @@ describe("render informationContainer", function () {
     let mainPage
     let informationContainer
     beforeEach(function (client, done) {
-
+        
         mainPage = client
-        .url(client.globals.baseAppUrl)
+        .url("localhost:3200")
         .page.main()
-        client.waitForElementVisible(".download-url-input", client.globals.visibleTimeout || 5000)
-        .pause(client.globals.visibleTimeout || 5000)
+        client.waitForElementVisible(".download-url-input", 5000)
+        .pause(5000)
         .clearValue(".download-url-input")
-        .setValue(".download-url-input", client.globals.specPath)
+        .setValue(".download-url-input", "http://localhost:3200/test-specs/petstore.json")
         .click("button.download-url-button")
         .pause(1000)
 
         informationContainer = mainPage.section.informationContainer
-
+        
         done()
     })
 
     it("renders section", function (client) {
-        mainPage.expect.section("@informationContainer").to.be.visible.before(client.globals.visibleTimeout || 5000)
+        mainPage.expect.section("@informationContainer").to.be.visible.before(5000)
 
         client.end()
     })
 
     it("renders content", function (client) {
-        informationContainer.waitForElementVisible("@title", client.globals.visibleTimeout || 5000)
+        informationContainer.waitForElementVisible("@title", 5000)
             .assert.containsText("@title", "Swagger Petstore")
             .assert.containsText("@version", "1.0.0")
-            .assert.containsText("@baseAppUrl", "[ Base URL: localhost:3204/ ]")
-            .assert.attributeEquals("@mainUrl", "href", client.globals.specPath)
-            .assert.containsText("@mainUrlContent", client.globals.specPath)
+            .assert.containsText("@baseUrl", "[ Base URL: localhost:3204/ ]")
+            .assert.attributeEquals("@mainUrl", "href", "http://localhost:3200/test-specs/petstore.json")
+            .assert.containsText("@mainUrlContent", "http://localhost:3200/test-specs/petstore.json")
             .assert.containsText("@description", "This is a sample server Petstore server. You can find out more about Swagger at http://swagger.io or on irc.freenode.net, #swagger. For this sample, you can use the api key special-key to test the authorization filters.")
             .assert.attributeEquals("@swaggerUrl", "href", "http://swagger.io/")
             .assert.attributeEquals("@swaggerircUrl", "href", "http://swagger.io/irc/")
@@ -42,7 +42,7 @@ describe("render informationContainer", function () {
             .assert.containsText("@contactDevLink", "Contact the developer")
             .assert.attributeEquals("@aboutSwaggerLink", "href", "http://swagger.io/")
             .assert.containsText("@aboutSwaggerLink", "Find out more about Swagger")
-
+            
         client.end()
     })
-})
+})

test/e2e/scenarios/models.js

@@ -3,12 +3,12 @@ describe("Render Model Wrapper", function () {
 
     beforeEach(function (client, done) {
         mainPage = client
-            .url(client.globals.baseAppUrl)
+            .url("localhost:3200")
             .page.main()
-        client.waitForElementVisible(".download-url-input", client.globals.visibleTimeout || 5000)
-            .pause(client.globals.visibleTimeout || 5000)
+        client.waitForElementVisible(".download-url-input", 5000)
+            .pause(5000)
             .clearValue(".download-url-input")
-            .setValue(".download-url-input", client.globals.specPath)
+            .setValue(".download-url-input", "http://localhost:3200/test-specs/petstore.json")
             .click("button.download-url-button")
             .pause(1000)
 
@@ -20,13 +20,13 @@ describe("Render Model Wrapper", function () {
         done()
     })
     it("Render model wrapper", function(client){
-        mainPage.expect.section("@modelWrapper").to.be.visible.before(client.globals.visibleTimeout || 5000)
+        mainPage.expect.section("@modelWrapper").to.be.visible.before(5000)
 
         client.end()
     })
 
     it("Render model wrapper collapse", function(client){
-        modelWrapper.waitForElementVisible("@modelContainer", client.globals.visibleTimeout || 5000)
+        modelWrapper.waitForElementVisible("@modelContainer", 5000)
             .click("@modelCollapse")
             .assert.cssClassNotPresent("@modelContainer", "is-open")
 

test/e2e/scenarios/operations/pet.js

@@ -3,13 +3,13 @@ describe("render pet api container", function () {
     let apiWrapper
     beforeEach(function (client, done) {
         mainPage = client
-            .url(client.globals.baseAppUrl)
+            .url("localhost:3200")
             .page.main()
 
-        client.waitForElementVisible(".download-url-input", client.globals.visibleTimeout || 5000)
-            .pause(client.globals.visibleTimeout || 5000)
+        client.waitForElementVisible(".download-url-input", 5000)
+            .pause(5000)
             .clearValue(".download-url-input")
-            .setValue(".download-url-input", client.globals.specPath)
+            .setValue(".download-url-input", "http://localhost:3200/test-specs/petstore.json")
             .click("button.download-url-button")
             .pause(1000)
 
@@ -25,13 +25,13 @@ describe("render pet api container", function () {
         client.end()
     })
     it("test rendered pet container", function (client) {
-        apiWrapper.waitForElementVisible("@petAPIWrapper", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@petAPIWrapper", 5000)
             .expect.element("@petAPIWrapper").to.be.visible
 
         client.end()
     })
     it("collapse pet wrapper", function (client) {
-        apiWrapper.waitForElementVisible("@petAPIWrapper", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@petAPIWrapper", 5000)
             .click("@petAPIWrapperBar")
             .assert.cssClassNotPresent("@petAPIWrapper", "is-open")
 
@@ -41,7 +41,7 @@ describe("render pet api container", function () {
         apiWrapper.waitForElementVisible("@petOperationPostContainer", 10000)
             .assert.containsText("@petOperationPostTitle", "/pet")
             .click("@petOperationPostCollpase")
-            .waitForElementVisible("@petOperationPostCollapseContainer", client.globals.visibleTimeout || 5000)
+            .waitForElementVisible("@petOperationPostCollapseContainer", 5000)
             .click("@petOperationPostTryBtn")
             .waitForElementVisible("@petOperationPostTryText", 1000)
             .waitForElementVisible("@petOperationPostExecuteBtn", 1000)
@@ -52,9 +52,9 @@ describe("render pet api container", function () {
     })
 
     it("Testing post /pet api Mock data", function (client) {
-        apiWrapper.waitForElementVisible("@petOperationPostContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@petOperationPostContainer", 5000)
             .click("@petOperationPostCollpase")
-            .waitForElementVisible("@petOperationPostCollapseContainer", client.globals.visibleTimeout || 5000)
+            .waitForElementVisible("@petOperationPostCollapseContainer", 5000)
             .click("@petOperationPostTryBtn")
             .waitForElementVisible("@petOperationPostExecuteBtn", 1000)
             .click("@petOperationPostExecuteBtn")
@@ -72,7 +72,7 @@ describe("render pet api container", function () {
     })
 
     it("render put /pet api container", function (client) {
-        apiWrapper.waitForElementVisible("@petOperationPutContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@petOperationPutContainer", 5000)
             .assert.containsText("@petOperationPutTitle", "/pet")
             .click("@petOperationPutCollpase")
             .waitForElementVisible("@petOperationPutCollapseContainer", 3000)
@@ -86,7 +86,7 @@ describe("render pet api container", function () {
     })
     
     it("Testing put /pet api Mock data", function (client) {
-        apiWrapper.waitForElementVisible("@petOperationPutContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@petOperationPutContainer", 5000)
             .click("@petOperationPutCollpase")
             .waitForElementVisible("@petOperationPutCollapseContainer", 3000)
             .click("@petOperationPutTryBtn")
@@ -106,7 +106,7 @@ describe("render pet api container", function () {
     })
 
     it("render get by tag /pet api container", function (client) {
-        apiWrapper.waitForElementVisible("@petOperationGetByTagContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@petOperationGetByTagContainer", 5000)
             .assert.containsText("@petOperationGetByTagTitle", "/pet/findByTags")
             .click("@petOperationGetByTagCollpase")
             .waitForElementVisible("@petOperationGetByTagCollapseContainer", 3000)
@@ -120,7 +120,7 @@ describe("render pet api container", function () {
     })
 
     it("Testing get by tag /pet api Mock data", function (client) {
-        apiWrapper.waitForElementVisible("@petOperationGetByTagContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@petOperationGetByTagContainer", 5000)
             .click("@petOperationGetByTagCollpase")
             .waitForElementVisible("@petOperationGetByTagCollapseContainer", 3000)
             .click("@petOperationGetByTagTryBtn")
@@ -140,7 +140,7 @@ describe("render pet api container", function () {
     })
     
     it("render get by ID /pet/{petId} api container", function (client) {
-        apiWrapper.waitForElementVisible("@petOperationGetByIdContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@petOperationGetByIdContainer", 5000)
             .assert.containsText("@petOperationGetByIdTitle", "/pet/{petId}")
             .click("@petOperationGetByIdCollpase")
             .waitForElementVisible("@petOperationGetByIdCollapseContainer", 3000)
@@ -153,7 +153,7 @@ describe("render pet api container", function () {
     })
 
     it("render get by ID /pet/{petId} api Mock data", function (client) {
-        apiWrapper.waitForElementVisible("@petOperationGetByIdContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@petOperationGetByIdContainer", 5000)
             .assert.containsText("@petOperationGetByIdTitle", "/pet/{petId}")
             .click("@petOperationGetByIdCollpase")
             .waitForElementVisible("@petOperationGetByIdCollapseContainer", 3000)

test/e2e/scenarios/operations/store.js

@@ -3,13 +3,13 @@ describe("render store api container", function(){
     let apiWrapper
     beforeEach( function(client, done){
         mainPage = client
-            .url(client.globals.baseAppUrl)
+            .url("localhost:3200")
             .page.main()
 
-        client.waitForElementVisible(".download-url-input", client.globals.visibleTimeout || 5000)
+        client.waitForElementVisible(".download-url-input", 5000)
             .pause(3000)
             .clearValue(".download-url-input")
-            .setValue(".download-url-input", client.globals.specPath)
+            .setValue(".download-url-input", "http://localhost:3200/test-specs/petstore.json")
             .click("button.download-url-button")
             .pause(1000)
 
@@ -21,23 +21,23 @@ describe("render store api container", function(){
         done()
     })
     it("test rendered store container", function(client){
-        apiWrapper.waitForElementVisible("@storeAPIWrapper", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@storeAPIWrapper", 5000)
             .expect.element("@storeAPIWrapper").to.be.visible
 
     client.end()
     })
     it("callapse store wrapper", function(client){
-        apiWrapper.waitForElementVisible("@storeAPIWrapper", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@storeAPIWrapper", 5000)
             .click("@storeAPIWrapperBar")
             .assert.cssClassNotPresent("@storeAPIWrapper", "is-open")
 
         client.end()
     })
     it("render get /store/inventory api container", function (client) {
-        apiWrapper.waitForElementVisible("@storeOperationGetContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@storeOperationGetContainer", 5000)
             .assert.containsText("@storeOperationGetTitle", "/store/inventory")
             .click("@storeOperationGetCollpase")
-            .waitForElementVisible("@storeOperationGetCollapseContainer", client.globals.visibleTimeout || 5000)
+            .waitForElementVisible("@storeOperationGetCollapseContainer", 5000)
             .click("@storeOperationGetTryBtn")
             .waitForElementVisible("@storeOperationGetExecuteBtn", 1000)
             .click("@storeOperationGetTryBtn")
@@ -47,7 +47,7 @@ describe("render store api container", function(){
     })
 
     it("Testing get /store/inventory api Mock data ", function (client) {
-        apiWrapper.waitForElementVisible("@storeOperationGetContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@storeOperationGetContainer", 5000)
             .assert.containsText("@storeOperationGetTitle", "/store/inventory")
             .click("@storeOperationGetCollpase")
             .waitForElementVisible("@storeOperationGetCollapseContainer", 3000)

test/e2e/scenarios/operations/user.js

@@ -3,13 +3,13 @@ describe("render user api container", function(){
     let apiWrapper
     beforeEach( function(client, done){
         mainPage = client
-            .url(client.globals.baseAppUrl)
+            .url("localhost:3200")
             .page.main()
 
-        client.waitForElementVisible(".download-url-input", client.globals.visibleTimeout || 5000)
-            .pause(client.globals.visibleTimeout || 5000)
+        client.waitForElementVisible(".download-url-input", 5000)
+            .pause(5000)
             .clearValue(".download-url-input")
-            .setValue(".download-url-input", client.globals.specPath)
+            .setValue(".download-url-input", "http://localhost:3200/test-specs/petstore.json")
             .click("button.download-url-button")
             .pause(1000)
 
@@ -21,20 +21,20 @@ describe("render user api container", function(){
         done()
     })
     it("test rendered user container", function(client){
-        apiWrapper.waitForElementVisible("@userAPIWrapper", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@userAPIWrapper", 5000)
             .expect.element("@userAPIWrapper").to.be.visible
 
     client.end()
     })
     it("callapse user wrapper", function(client){
-        apiWrapper.waitForElementVisible("@userAPIWrapper", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@userAPIWrapper", 5000)
             .click("@userAPIWrapperBar")
             .assert.cssClassNotPresent("@userAPIWrapper", "is-open")
 
         client.end()
     })
     it("render put /user/{username} api container", function (client) {
-        apiWrapper.waitForElementVisible("@userOperationPutContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@userOperationPutContainer", 5000)
             .assert.containsText("@userOperationPutTitle", "/user/{username}")
             .click("@userOperationPutCollpase")
             .waitForElementVisible("@userOperationPutCollapseContainer", 3000)
@@ -46,7 +46,7 @@ describe("render user api container", function(){
         client.end()
     })
     it("Test put /user/{username} api Mock data", function (client) {
-        apiWrapper.waitForElementVisible("@userOperationPutContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@userOperationPutContainer", 5000)
             .assert.containsText("@userOperationPutTitle", "/user/{username}")
             .click("@userOperationPutCollpase")
             .waitForElementVisible("@userOperationPutCollapseContainer", 3000)
@@ -63,7 +63,7 @@ describe("render user api container", function(){
         client.end()
     })
     it("render delete /user/{username} api container", function (client) {
-        apiWrapper.waitForElementVisible("@userOperationDeleteContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@userOperationDeleteContainer", 5000)
             .assert.containsText("@userOperationDeleteTitle", "/user/{username}")
             .click("@userOperationDeleteCollpase")
             .waitForElementVisible("@userOperationDeleteCollapseContainer", 3000)
@@ -75,7 +75,7 @@ describe("render user api container", function(){
         client.end()
     })
     it("Test delete /user/{username} api Mock data", function (client) {
-        apiWrapper.waitForElementVisible("@userOperationDeleteContainer", client.globals.visibleTimeout || 5000)
+        apiWrapper.waitForElementVisible("@userOperationDeleteContainer", 5000)
             .assert.containsText("@userOperationDeleteTitle", "/user/{username}")
             .click("@userOperationDeleteCollpase")
             .waitForElementVisible("@userOperationDeleteCollapseContainer", 3000)

test/e2e/scenarios/schemeContainer.js

@@ -4,15 +4,15 @@ describe("Render scheme", function () {
     beforeEach(function (client, done) {
 
         mainPage = client
-        .url(client.globals.baseAppUrl)
+        .url("localhost:3200")
         .page.main()
 
         schemeContainer = mainPage.section.schemeContainer
 
-        client.waitForElementVisible(".download-url-input", client.globals.visibleTimeout || 5000)
-        .pause(client.globals.visibleTimeout || 5000)
+        client.waitForElementVisible(".download-url-input", 5000)
+        .pause(5000)
         .clearValue(".download-url-input")
-        .setValue(".download-url-input", client.globals.specPath)
+        .setValue(".download-url-input", "http://localhost:3200/test-specs/petstore.json")
         .click("button.download-url-button")
         .pause(1000)
 
@@ -21,25 +21,25 @@ describe("Render scheme", function () {
     })
 
     it("render section", function (client) {
-        mainPage.expect.section("@schemeContainer").to.be.visible.before(client.globals.visibleTimeout || 5000)
+        mainPage.expect.section("@schemeContainer").to.be.visible.before(5000)
 
         client.end()
     })
     it("render scheme option", function (client) {
-        schemeContainer.waitForElementVisible("@httpOption", client.globals.visibleTimeout || 5000)
+        schemeContainer.waitForElementVisible("@httpOption", 5000)
         .expect.element("@httpOption").to.be.selected
 
         client.end()
     })
 
     it("render authorized button", function (client) {
-        schemeContainer.waitForElementVisible("@btnAuthorize", client.globals.visibleTimeout || 5000)
+        schemeContainer.waitForElementVisible("@btnAuthorize", 5000)
         .expect.element("@btnAuthorize").to.be.visible
 
         client.end()
     })
     it("render click event", function(client) {
-        schemeContainer.waitForElementVisible("@btnAuthorize", client.globals.visibleTimeout || 5000)
+        schemeContainer.waitForElementVisible("@btnAuthorize", 5000)
         .click("@btnAuthorize")
         .assert.visible("@authorizationModal")
         .assert.containsText("@appName", "Application: your-app-name")
@@ -49,4 +49,4 @@ describe("Render scheme", function () {
 
         client.end()
     })
-})
+})

test/e2e/scenarios/topbar.js

@@ -18,15 +18,15 @@ describe("initial render", function () {
 
         beforeEach(function (client, done) {
         mainPage = client
-            .url(client.globals.baseAppUrl)
+            .url("localhost:3200")
             .page.main()
 
         topbar = mainPage.section.topbar
 
         client.waitForElementVisible(".download-url-input", 10000)
-            .pause(client.globals.visibleTimeout || 5000)
+            .pause(5000)
             .clearValue(".download-url-input")
-            .setValue(".download-url-input", client.globals.specPath)
+            .setValue(".download-url-input", "http://localhost:3200/test-specs/petstore.json")
             .click("button.download-url-button")
             .pause(1000)