Merge branch 'v/3.17.2' of github.com:swagger-api/swagger-ui into v/3.17.2

without this, a recent Swagger Client change breaks
cc: https://github.com/swagger-api/swagger-js/commit/f8fccb45107c76c0dd45d9d0e4583087b97ef6b3

.eslintrc

@@ -13,15 +13,11 @@
     }
   },
 
-  "extends": [
-    "eslint:recommended",
-    "plugin:react/recommended"
-  ],
+  "extends": ["eslint:recommended", "plugin:react/recommended"],
 
   "plugins": [
     "react",
-    "mocha",
-    "import"
+    "mocha"
   ],
 
   "rules": {
@@ -38,7 +34,6 @@
     "no-console": ["error", { allow: ["warn", "error"] }],
     "react/jsx-no-bind": 1,
     "react/display-name": 0,
-    "mocha/no-exclusive-tests": "error",
-    "import/no-extraneous-dependencies": [2]
+    "mocha/no-exclusive-tests": "error"
   }
 }

package.json

@@ -30,7 +30,7 @@
     "lint-fix": "eslint --cache --ext '.js,.jsx' src test --fix",
     "test": "run-s just-test-in-node lint-errors",
     "test-in-node": "run-s lint-errors just-test-in-node",
-    "just-test-in-node": "mocha --require test/setup.js --recursive --compilers js:babel-core/register --require source-map-support test/core test/components test/bugs test/swagger-ui-dist-package test/xss",
+    "just-test-in-node": "mocha --require test/setup.js --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",
@@ -72,7 +72,7 @@
     "redux": "^3.x.x",
     "redux-immutable": "3.0.8",
     "remarkable": "^1.7.1",
-    "reselect": "^2.5.4",
+    "reselect": "^3.0.1",
     "serialize-error": "^2.1.0",
     "swagger-client": "^3.8.7",
     "url-parse": "^1.1.8",
@@ -100,7 +100,7 @@
     "deepmerge": "^2.1.0",
     "enzyme": "^2.7.1",
     "eslint": "^4.1.1",
-    "eslint-plugin-import": "^2.13.0",
+    "eslint-plugin-import": "^2.6.0",
     "eslint-plugin-mocha": "^4.11.0",
     "eslint-plugin-react": "~7.7.0",
     "expect": "^1.20.2",

src/.eslintrc

@@ -1,10 +0,0 @@
-{
-  "rules": {
-    "import/no-extraneous-dependencies": [
-      2,
-      {
-        "devDependencies": false
-      }
-    ]
-  }
-}

src/core/components/try-it-out-button.jsx

@@ -21,8 +21,8 @@ export default class TryItOutButton extends React.Component {
     return (
       <div className="try-out">
         {
-          enabled ? <button className="btn try-out__btn cancel" onClick={ onCancelClick }>Cancel</button>
-                  : <button className="btn try-out__btn" onClick={ onTryoutClick }>Try it out </button>
+          enabled ? <button className="btn try-out__btn cancel" onClick={ onTryoutClick }>Cancel</button>
+                  : <button className="btn try-out__btn" onClick={ onCancelClick }>Try it out </button>
         }
       </div>
     )

src/core/containers/OperationContainer.jsx

@@ -113,11 +113,11 @@ export default class OperationContainer extends PureComponent {
     layoutActions.show(["operations", tag, operationId], !isShown)
   }
 
-  onCancelClick=() => {
+  onTryoutClick =() => {
     this.setState({tryItOutEnabled: !this.state.tryItOutEnabled})
   }
 
-  onTryoutClick =() => {
+  onCancelClick =() => {
     let { specActions, path, method } = this.props
     this.setState({tryItOutEnabled: !this.state.tryItOutEnabled})
     specActions.clearValidateParams([path, method])

src/core/plugins/oas3/helpers.js

@@ -2,20 +2,16 @@ import React from "react"
 
 export function isOAS3(jsSpec) {
   const oasVersion = jsSpec.get("openapi")
-  if(typeof oasVersion !== "string") {
+  if(!oasVersion) {
     return false
   }
 
-  // we gate against `3.1` becasue we want to explicitly opt into supporting it
-  // at some point in the future -- KS, 7/2018
-
-  // starts with, but is not `3.0.` exactly
-  return oasVersion.startsWith("3.0.") && oasVersion.length > 4
+  return oasVersion.startsWith("3.0.")
 }
 
 export function isSwagger2(jsSpec) {
   const swaggerVersion = jsSpec.get("swagger")
-  if(typeof swaggerVersion !== "string") {
+  if(!swaggerVersion) {
     return false
   }
 

test/core/plugins/oas3/helpers.js

@@ -1,68 +0,0 @@
-import { fromJS } from "immutable"
-import { isOAS3, isSwagger2 } from "corePlugins/oas3/helpers"
-import expect from "expect"
-
-const isOAS3Shorthand = (version) => isOAS3(fromJS({
-  openapi: version
-}))
-
-const isSwagger2Shorthand = (version) => isSwagger2(fromJS({
-  swagger: version
-}))
-
-describe("isOAS3", function () {
-  it("should recognize valid OAS3 version values", function () {
-    expect(isOAS3Shorthand("3.0.0")).toEqual(true)
-    expect(isOAS3Shorthand("3.0.1")).toEqual(true)
-    expect(isOAS3Shorthand("3.0.11111")).toEqual(true)
-    expect(isOAS3Shorthand("3.0.0-rc0")).toEqual(true)
-  })
-
-  it("should fail for invalid OAS3 version values", function () {
-    expect(isOAS3Shorthand("3.0")).toEqual(false)
-    expect(isOAS3Shorthand("3.0.")).toEqual(false)
-    expect(isOAS3Shorthand("2.0")).toEqual(false)
-  })
-
-  it("should gracefully fail for non-string values", function () {
-    expect(isOAS3Shorthand(3.0)).toEqual(false)
-    expect(isOAS3Shorthand(3)).toEqual(false)
-    expect(isOAS3Shorthand({})).toEqual(false)
-    expect(isOAS3Shorthand(null)).toEqual(false)
-  })
-
-  it("should gracefully fail when `openapi` field is missing", function () {
-    expect(isOAS3(fromJS({
-      openApi: "3.0.0"
-    }))).toEqual(false)
-    expect(isOAS3Shorthand(null)).toEqual(false)
-  })
-})
-
-describe("isSwagger2", function () {
-  it("should recognize valid Swagger 2.0 version values", function () {
-    expect(isSwagger2Shorthand("2.0")).toEqual(true)
-    expect(isSwagger2Shorthand("2.0-rc0")).toEqual(true)
-  })
-
-  it("should fail for invalid Swagger 2.0 version values", function () {
-    expect(isSwagger2Shorthand("3.0")).toEqual(false)
-    expect(isSwagger2Shorthand("3.0.")).toEqual(false)
-    expect(isSwagger2Shorthand("2.1")).toEqual(false)
-    expect(isSwagger2Shorthand("1.2")).toEqual(false)
-    expect(isSwagger2Shorthand("2")).toEqual(false)
-  })
-
-  it("should gracefully fail for non-string values", function () {
-    expect(isSwagger2Shorthand(2.0)).toEqual(false)
-    expect(isSwagger2Shorthand(2)).toEqual(false)
-    expect(isSwagger2Shorthand({})).toEqual(false)
-    expect(isSwagger2Shorthand(null)).toEqual(false)
-  })
-
-  it("should gracefully fail when `swagger` field is missing", function () {
-    expect(isSwagger2(fromJS({
-      Swagger: "2.0"
-    }))).toEqual(false)
-  })
-})