Merge branch 'master' into fix-falsy-formatValue

Author: shockey

src/http.js

@@ -64,12 +64,8 @@ export default function http(url, request = {}) {
   })
 }
 
-function shouldDownloadAsText(contentType) {
-  return /json/.test(contentType) ||
-         /xml/.test(contentType) ||
-         /yaml/.test(contentType) ||
-         /text/.test(contentType)
-}
+// exported for testing
+export const shouldDownloadAsText = (contentType = "") => /json|xml|yaml|text/.test(contentType)
 
 // Serialize the response, returns a promise with headers and the body part of the hash
 export function serializeRes(oriRes, url, {loadSpec = false} = {}) {

test/http.js

@@ -1,7 +1,10 @@
 import expect from 'expect'
 import xmock from 'xmock'
 import fetchMock from 'fetch-mock'
-import http, {serializeHeaders, mergeInQueryOrForm, encodeFormOrQuery, serializeRes} from '../src/http'
+import http, {
+  serializeHeaders, mergeInQueryOrForm, encodeFormOrQuery, serializeRes,
+  shouldDownloadAsText
+} from '../src/http'
 
 describe('http', () => {
   let xapp
@@ -306,4 +309,31 @@ describe('http', () => {
       }).then(fetchMock.restore)
     })
   })
+
+  describe('shouldDownloadAsText', () => {
+    it('should return true for json, xml, yaml, and text types', function() {
+      const types = [
+        "text/x-yaml", "application/xml", "text/xml", "application/json",
+        "text/plain"
+      ]
+
+      types.forEach(v => {
+        expect(`${v} ${shouldDownloadAsText(v)}`).toEqual(v + " true")
+      })
+    })
+
+    it('should return false for other common types', function() {
+      const types = [
+        "application/octet-stream", "application/x-binary"
+      ]
+
+      types.forEach(v => {
+        expect(`${v} ${shouldDownloadAsText(v)}`).toEqual(v + " false")
+      })
+    })
+
+    it('should fail gracefully when called with no parameters', function() {
+      expect(shouldDownloadAsText()).toEqual(false)
+    })
+  })
 })