Merge branch 'master' into bug/opid-safe-access

Author: shockey

.github/pull_request_template.md

@@ -0,0 +1,42 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+### Description
+<!--- Describe your changes in detail -->
+
+
+
+### Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+<!--- Use the magic "Fixes #1234" format, so the issues are -->
+<!--- automatically closed when this PR is merged. -->
+
+
+
+### How Has This Been Tested?
+<!--- Please describe in detail how you manually tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+
+
+### Screenshots (if appropriate):
+
+
+
+### Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] No code changes (changes to documentation, CI, metadata, etc)
+- [ ] Dependency changes (any modification to dependencies in `package.json`)
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+### Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have added tests to cover my changes.
+- [ ] All new and existing tests passed.

.travis.yml

@@ -1,19 +1,16 @@
+sudo: false
 language: node_js
 node_js:
 - '4.7'
 - '6.9'
-env:
-  - CXX=g++-4.8
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
+cache:
+  directories:
+    - node_modules
 branches:
   only:
   - master
   - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+before_script: "npm update"
 before_deploy: "npm run build"
 deploy:
   provider: npm

README.md

@@ -64,7 +64,7 @@ This lib exposes these functionalities:
 HTTP Client
 -----------
 
-`Swagger.http(req)` exposes a [Fetch-like interface](https://github.com/matthew-andrews/isomorphic-fetch) with a twist: allowing `url` in the request object so that it can be passed around and mutated. It extends Fetch to support request and response interceptors and performs response & header serialization. This method could be overridden to change how SwaggerJS performs HTTP requests.
+`Swagger.http(req)` exposes a [Fetch-like interface](https://github.com/lquixada/cross-fetch) with a twist: allowing `url` in the request object so that it can be passed around and mutated. It extends Fetch to support request and response interceptors and performs response & header serialization. This method could be overridden to change how SwaggerJS performs HTTP requests.
 
 ```js
 // Fetch-like, but support `url`, `query` and `xxxInterceptor`
@@ -279,6 +279,7 @@ npm run test         # run test
 npm run test:watch   # run test with change watching
 npm run lint         # run lint
 npm run build        # package to release
+npm run build-dev    # package with non-minified dist/index.js (for debugging)
 npm run build-bundle # build browser version available at .../browser
 ```
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "main": "dist/index.js",
   "repository": "[email protected]:swagger-api/swagger-js.git",
@@ -17,6 +17,7 @@
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack -p --config ./webpack.config.js",
+    "build-dev": "cross-env NODE_ENV=development webpack --config ./webpack.config.js",
     "build-bundle": "cross-env NODE_ENV=production webpack -p --config ./webpack.bundle.config.js",
     "watch": "webpack --config webpack.config.js --watch --progress",
     "test": "npm run just-test && npm run lint",
@@ -64,12 +65,12 @@
     "babel-runtime": "^6.23.0",
     "btoa": "1.1.2",
     "cookie": "^0.3.1",
+    "cross-fetch": "0.0.8",
     "deep-extend": "^0.4.1",
     "fast-json-patch": "1.1.8",
-    "isomorphic-fetch": "2.2.1",
     "isomorphic-form-data": "0.0.1",
     "js-yaml": "^3.8.1",
-    "lodash": "4.16.2",
+    "lodash": "^4.16.2",
     "qs": "^6.3.0",
     "url": "^0.11.0"
   }

src/http.js

@@ -1,4 +1,4 @@
-import 'isomorphic-fetch'
+import 'cross-fetch/polyfill'
 import qs from 'qs'
 import jsYaml from 'js-yaml'
 import isString from 'lodash/isString'

src/specmap/lib/refs.js

@@ -1,4 +1,4 @@
-import fetch from 'isomorphic-fetch'
+import {fetch} from 'cross-fetch'
 import url from 'url'
 import lib from '../lib'
 import createError from '../lib/create-error'

test/client.js

@@ -38,6 +38,17 @@ describe('http', () => {
         }
       }
 
+      if (req.headers['x-setcontenttype']) {
+        console.log('here come dat header', req.headers)
+        // Allow the test to explicitly set (or unset) a content type
+        if (req.headers['x-setcontenttype'] === 'none') {
+          res.removeHeader('Content-Type')
+        }
+        else {
+          res.setHeader('Content-Type', req.headers['x-setcontenttype'])
+        }
+      }
+
       fs.exists(filename, function (exists) {
         if (exists) {
           const fileStream = fs.createReadStream(filename)
@@ -61,7 +72,25 @@ describe('http', () => {
   afterEach(function () {
   })
 
-  it.skip('should get the petstore api and build it', (done) => {
+  it('should get the JSON petstore api and build it', (done) => {
+    Swagger('http://localhost:8000/petstore.json')
+      .then((client) => {
+        expect(client).toExist()
+
+        // we have 3 tags
+        expect(Object.keys(client.apis).length).toBe(3)
+
+        // the pet tag exists
+        expect(client.apis.pet).toExist()
+
+        // the get pet operation
+        expect(client.apis.pet.getPetById).toExist()
+
+        done()
+      })
+  })
+
+  it('should get the YAML petstore api and build it', (done) => {
     Swagger('http://localhost:8000/petstore.json')
       .then((client) => {
         expect(client).toExist()
@@ -79,6 +108,54 @@ describe('http', () => {
       })
   })
 
+  it('should get the JSON petstore api and build it when response lacks a `Content-Type`', (done) => {
+    Swagger('http://localhost:8000/petstore.json', {
+      requestInterceptor: (req) => {
+        req.headers['X-SetContentType'] = 'none'
+        return req
+      }
+    })
+      .then((client) => {
+        expect(client).toExist()
+
+        // we have 3 tags
+        expect(Object.keys(client.apis).length).toBe(3)
+
+        // the pet tag exists
+        expect(client.apis.pet).toExist()
+
+        // the get pet operation
+        expect(client.apis.pet.getPetById).toExist()
+
+        done()
+      })
+      .catch(err => done(err))
+  })
+
+  it('should get the YAML petstore api and build it when response lacks a `Content-Type`', (done) => {
+    Swagger('http://localhost:8000/petstore.yaml', {
+      requestInterceptor: (req) => {
+        req.headers['X-SetContentType'] = 'none'
+        return req
+      }
+    })
+      .then((client) => {
+        expect(client).toExist()
+
+        // we have 3 tags
+        expect(Object.keys(client.apis).length).toBe(3)
+
+        // the pet tag exists
+        expect(client.apis.pet).toExist()
+
+        // the get pet operation
+        expect(client.apis.pet.getPetById).toExist()
+
+        done()
+      })
+      .catch(err => done(err))
+  })
+
   /**
    * See https://github.com/swagger-api/swagger-js/issues/1005
    */