WIP

Author: shockey

src/execute/index.js

@@ -102,7 +102,7 @@ export function buildRequest(options) {
   }
 
   // Base Template
-  const req = {
+  let req = {
     url: baseUrl({spec, scheme, contextUrl, server, serverVariables}),
     credentials: 'same-origin',
     headers: {
@@ -191,11 +191,18 @@ export function buildRequest(options) {
   const versionSpecificOptions = {...options, operation}
 
   if (specIsOAS3) {
-    return oas3BuildRequest(versionSpecificOptions, req)
+    req = oas3BuildRequest(versionSpecificOptions, req)
   }
+  else {
+    // If not OAS3, then treat as Swagger2.
+    req = swagger2BuildRequest(versionSpecificOptions, req)
+  }
+
+  // Will add the query object into the URL, if it exists
+  // ... will also create a FormData instance, if multipart/form-data (eg: a file)
+  mergeInQueryOrForm(req)
 
-  // If not OAS3, then treat as Swagger2.
-  return swagger2BuildRequest(versionSpecificOptions, req)
+  return req
 }
 
 const stripNonAlpha = str => (str ? str.replace(/\W/g, '') : null)

src/execute/oas3/style-serializer.js

@@ -23,7 +23,7 @@ function encodeArray({key, value, style, explode}) {
       if (!prev || explode) {
         return `${(prev || '')};${key}=${curr}`
       }
-      return prev + `,${curr}`
+      return `${prev},${curr}`
     }, '')
   }
   if (style === 'form') {

src/execute/swagger2/build-request.js

@@ -35,10 +35,6 @@ export default function (options, req) {
     }
   }
 
-  // Will add the query object into the URL, if it exists
-  // ... will also create a FormData instance, if multipart/form-data (eg: a file)
-  mergeInQueryOrForm(req)
-
   return req
 }
 

test/oas3/execute/style-explode.js

@@ -11,7 +11,7 @@ const petstoreSpec = jsYaml.safeLoad(fs.readFileSync(path.join('test', 'oas3', '
 // Supported shape...  { spec, operationId, parameters, securities, fetch }
 // One can use operationId or pathItem + method
 
-describe.skip('buildRequest w/ `style` & `explode` - OpenAPI Specification 3.0', function () {
+describe('buildRequest w/ `style` & `explode` - OpenAPI Specification 3.0', function () {
   describe('path parameters', function () {
     describe('primitive values', function () {
       it('default: should build a path parameter in a simple/no-explode format', function () {

test/swagger2/execute/apply-securities.js

@@ -1,5 +1,5 @@
 import expect from 'expect'
-import { applySecurities } from '../../../src/execute/swagger2/build-request'
+import {applySecurities} from '../../../src/execute/swagger2/build-request'
 
 describe('swagger2 - execute - applySecurities', function () {
   it('should NOT add any securities, if the operation does not require it', function () {