Add fixes for es6 generator (#180)

Various fixes for JS (ES6) generator

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java

@@ -986,6 +986,11 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
                 }
                 String jsdocType = getJSDocType(operation);
                 operation.vendorExtensions.put("x-jsdoc-type", jsdocType);
+
+                // Format the return type correctly
+                if (operation.returnType != null) {
+                    operation.vendorExtensions.put("x-return-type", normalizeType(operation.returnType));
+                }
             }
         }
         return objs;

modules/openapi-generator/src/main/resources/Javascript/api.mustache

@@ -84,7 +84,7 @@
       var authNames = [<#authMethods>'<name>'<#hasMore>, </hasMore></authMethods>];
       var contentTypes = [<#consumes>'<& mediaType>'<#hasMore>, </hasMore></consumes>];
       var accepts = [<#produces>'<& mediaType>'<#hasMore>, </hasMore></produces>];
-      var returnType = <#returnType><&returnType></returnType><^returnType>null</returnType>;
+      var returnType = <#vendorExtensions.x-return-type><&vendorExtensions.x-return-type></vendorExtensions.x-return-type><^vendorExtensions.x-return-type>null</vendorExtensions.x-return-type>;
 
       return this.apiClient.callApi(
         '<&path>', '<httpMethod>',

modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache

@@ -15,7 +15,7 @@ import querystring from "querystring";
 * @alias module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}ApiClient
 * @class
 */{{/emitJSDoc}}
-export default class ApiClient {
+class ApiClient {
     constructor() {
         {{#emitJSDoc}}/**
          * The base URL against which to resolve every API call's (relative) path.
@@ -221,43 +221,6 @@ export default class ApiClient {
         return newParams;
     }
 
-    {{#emitJSDoc}}/**
-    * Enumeration of collection format separator strategies.
-    * @enum {String}
-    * @readonly
-    */{{/emitJSDoc}}
-    static CollectionFormatEnum = {
-        {{#emitJSDoc}}/**
-         * Comma-separated values. Value: <code>csv</code>
-         * @const
-         */{{/emitJSDoc}}
-        CSV: ',',
-
-        {{#emitJSDoc}}/**
-         * Space-separated values. Value: <code>ssv</code>
-         * @const
-         */{{/emitJSDoc}}
-        SSV: ' ',
-
-        {{#emitJSDoc}}/**
-         * Tab-separated values. Value: <code>tsv</code>
-         * @const
-         */{{/emitJSDoc}}
-        TSV: '\t',
-
-        {{#emitJSDoc}}/**
-         * Pipe(|)-separated values. Value: <code>pipes</code>
-         * @const
-         */{{/emitJSDoc}}
-        PIPES: '|',
-
-        {{#emitJSDoc}}/**
-         * Native array. Value: <code>multi</code>
-         * @const
-         */{{/emitJSDoc}}
-        MULTI: 'multi'
-    };
-
     {{#emitJSDoc}}/**
     * Builds a string representation of an array-type actual parameter, according to the given collection format.
     * @param {Array} param An array parameter.
@@ -597,8 +560,46 @@ export default class ApiClient {
     };
 }
 
+{{#emitJSDoc}}/**
+ * Enumeration of collection format separator strategies.
+ * @enum {String}
+ * @readonly
+ */{{/emitJSDoc}}
+ApiClient.CollectionFormatEnum = {
+    {{#emitJSDoc}}/**
+     * Comma-separated values. Value: <code>csv</code>
+     * @const
+     */{{/emitJSDoc}}
+    CSV: ',',
+
+    {{#emitJSDoc}}/**
+     * Space-separated values. Value: <code>ssv</code>
+     * @const
+     */{{/emitJSDoc}}
+    SSV: ' ',
+
+    {{#emitJSDoc}}/**
+     * Tab-separated values. Value: <code>tsv</code>
+     * @const
+     */{{/emitJSDoc}}
+    TSV: '\t',
+
+    {{#emitJSDoc}}/**
+     * Pipe(|)-separated values. Value: <code>pipes</code>
+     * @const
+     */{{/emitJSDoc}}
+    PIPES: '|',
+
+    {{#emitJSDoc}}/**
+     * Native array. Value: <code>multi</code>
+     * @const
+     */{{/emitJSDoc}}
+    MULTI: 'multi'
+};
+
 {{#emitJSDoc}}/**
 * The default API client implementation.
 * @type {module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}ApiClient}
 */{{/emitJSDoc}}
 ApiClient.instance = new ApiClient();
+export default ApiClient;

modules/openapi-generator/src/main/resources/Javascript/es6/api.mustache

@@ -69,7 +69,7 @@ export default class <classname> {
       let authNames = [<#authMethods>'<name>'<#hasMore>, </hasMore></authMethods>];
       let contentTypes = [<#consumes>'<& mediaType>'<#hasMore>, </hasMore></consumes>];
       let accepts = [<#produces>'<& mediaType>'<#hasMore>, </hasMore></produces>];
-      let returnType = <#returnType><&returnType></returnType><^returnType>null</returnType>;
+      let returnType = <#vendorExtensions.x-return-type><&vendorExtensions.x-return-type></vendorExtensions.x-return-type><^vendorExtensions.x-return-type>null</vendorExtensions.x-return-type>;
 
       return this.apiClient.callApi(
         '<&path>', '<httpMethod>',

modules/openapi-generator/src/main/resources/Javascript/es6/model.mustache

@@ -1,9 +1,4 @@
 {{>licenseInfo}}
-
 import ApiClient from '../ApiClient';
 {{#imports}}import {{import}} from './{{import}}';
-{{/imports}}
+{{/imports}}{{#models}}{{#model}}{{#isEnum}}{{>partial_model_enum_class}}{{/isEnum}}{{^isEnum}}{{>partial_model_generic}}{{/isEnum}}{{/model}}{{/models}}
-
-{{#models}}{{#model}}
-{{#isEnum}}{{>partial_model_enum_class}}{{/isEnum}}{{^isEnum}}{{>partial_model_generic}}{{/isEnum}}
-{{/model}}{{/models}}

modules/openapi-generator/src/main/resources/Javascript/es6/partial_model_enum_class.mustache

@@ -9,7 +9,7 @@ export default class {{classname}} {
          * value: {{{value}}}
          * @const
          */{{/emitJSDoc}}
-        {{name}} = {{{value}}};
+        "{{name}}" = {{{value}}};
 
     {{/enumVars}}{{/allowableValues}}
 

modules/openapi-generator/src/main/resources/Javascript/es6/partial_model_generic.mustache

@@ -1,35 +1,32 @@
 
-{{#models}}{{#model}}
+{{#models}}{{#model}}{{#emitJSDoc}}/**
-
-{{#emitJSDoc}}/**
  * The {{classname}} model module.
  * @module {{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}
  * @version {{projectVersion}}
  */{{/emitJSDoc}}
-export default class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}extends Array {{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}{
+class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}extends Array {{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}{
     {{#emitJSDoc}}/**
      * Constructs a new <code>{{classname}}</code>.{{#description}}
      * {{description}}{{/description}}
-    * @alias module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}
+     * @alias module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}{{#useInheritance}}{{#parent}}
-    * @class{{#useInheritance}}{{#parent}}
      * @extends {{#parentModel}}module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}{{/parentModel}}{{^parentModel}}{{#vendorExtensions.x-isArray}}Array{{/vendorExtensions.x-isArray}}{{#vendorExtensions.x-isMap}}Object{{/vendorExtensions.x-isMap}}{{/parentModel}}{{/parent}}{{#interfaces}}
      * @implements module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{.}}{{/interfaces}}{{/useInheritance}}{{#vendorExtensions.x-all-required}}
      * @param {{name}} {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{#description}}{{{description}}}{{/description}}{{/vendorExtensions.x-all-required}}
      */{{/emitJSDoc}}
-
+    constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) { {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}
-    constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) {
-        {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}
         super();
-        {{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
+        {{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}{{#useInheritance}}
+        {{#interfaceModels}}{{classname}}.initialize(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/interfaceModels}}{{/useInheritance}}
+        {{classname}}.initialize(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});
+    }
 
-        {{#useInheritance}}
+    {{#emitJSDoc}}/**
-        {{#parentModel}}{{classname}}.call(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/parentModel}}
+     * Initializes the fields of this object.
-        {{#interfaceModels}}{{classname}}.call(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/interfaceModels}}
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        {{/useInheritance}}
+     * Only for internal use.
-
+     */{{/emitJSDoc}}
-        {{#vars}}{{#required}}this['{{baseName}}'] = {{name}};{{/required}}{{/vars}}
+    static initialize(obj{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}}) { {{#vars}}{{#required}}
-
+        obj['{{baseName}}'] = {{name}};{{/required}}{{/vars}}
-        {{#parent}}{{^parentModel}}return this;{{/parentModel}}{{/parent}}
     }
 
     {{#emitJSDoc}}/**
@@ -41,14 +38,12 @@ export default class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtension
      */{{/emitJSDoc}}
     static constructFromObject(data, obj) {
         if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} {
-            obj = obj || new {{classname}}();
+            obj = obj || new {{classname}}();{{#parent}}{{^parentModel}}
 
-            {{#parent}}{{^parentModel}}ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');{{/parentModel}}
+            ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');
-            {{/parent}}
+            {{/parentModel}}{{/parent}}{{#useInheritance}}{{#parentModel}}
-
+            {{classname}}.constructFromObject(data, obj);{{/parentModel}}{{#interfaces}}
-            {{#useInheritance}}{{#parentModel}}{{classname}}.constructFromObject(data, obj);{{/parentModel}}
+            {{.}}.constructFromObject(data, obj);{{/interfaces}}{{/useInheritance}}
-            {{#interfaces}}{{.}}.constructFromObject(data, obj);{{/interfaces}}
-            {{/useInheritance}}
 
             {{#vars}}
             if (data.hasOwnProperty('{{baseName}}')) {
@@ -59,29 +54,7 @@ export default class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtension
         return obj;
     }
 
-{{#vars}}
+{{#emitModelMethods}}{{#vars}}{{#emitJSDoc}}/**{{#description}}
-    {{#emitJSDoc}}/**{{#description}}
-    * {{{description}}}{{/description}}
-    * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}{{#defaultValue}}
-    * @default {{{defaultValue}}}{{/defaultValue}}
-    */{{/emitJSDoc}}
-    {{baseName}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
-{{/vars}}
-
-{{#useInheritance}}{{#interfaceModels}}
-    // Implement {{classname}} interface:
-    {{#allVars}}{{#emitJSDoc}}/**{{#description}}
-    * {{{description}}}{{/description}}
-    * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}{{#defaultValue}}
-    * @default {{{defaultValue}}}{{/defaultValue}}
-    */{{/emitJSDoc}}
-    {{baseName}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
-    {{/allVars}}
-{{/interfaceModels}}{{/useInheritance}}
-
-
-{{#emitModelMethods}}{{#vars}}
-    {{#emitJSDoc}}/**{{#description}}
      * Returns {{{description}}}{{/description}}{{#minimum}}
      * minimum: {{minimum}}{{/minimum}}{{#maximum}}
      * maximum: {{maximum}}{{/maximum}}
@@ -98,22 +71,32 @@ export default class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtension
     {{setter}}({{name}}) {
         this['{{baseName}}'] = {{name}};
     }
-{{/vars}}{{/emitModelMethods}}
+{{/vars}}{{/emitModelMethods}}{{/model}}
+}
+
+{{#vars}}{{#emitJSDoc}}/**{{#description}}
+ * {{{description}}}{{/description}}
+ * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}{{#defaultValue}}
+ * @default {{{defaultValue}}}{{/defaultValue}}
+ */{{/emitJSDoc}}
+{{classname}}.prototype['{{baseName}}'] = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
 
-{{#vars}}
-{{#isEnum}}
-{{^isContainer}}
-{{>partial_model_inner_enum}}
-{{/isContainer}}
-{{/isEnum}}
-{{#items.isEnum}}
-{{#items}}
-{{^isContainer}}
-{{>partial_model_inner_enum}}
-{{/isContainer}}
-{{/items}}
-{{/items.isEnum}}
 {{/vars}}
 
-{{/model}}{{/models}}
+{{#useInheritance}}{{#interfaceModels}}// Implement {{classname}} interface:
-}
+{{#allVars}}{{#emitJSDoc}}/**{{#description}}
+ * {{{description}}}{{/description}}
+ * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}{{#defaultValue}}
+ * @default {{{defaultValue}}}{{/defaultValue}}
+ */{{/emitJSDoc}}
+{{classname}}.prototype['{{baseName}}'] = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};
+{{/allVars}}{{/interfaceModels}}{{/useInheritance}}
+
+{{#vars}}{{#isEnum}}{{^isContainer}}
+{{>partial_model_inner_enum}}
+{{/isContainer}}{{/isEnum}}{{#items.isEnum}}{{#items}}{{^isContainer}}
+{{>partial_model_inner_enum}}
+{{/isContainer}}{{/items}}{{/items.isEnum}}{{/vars}}
+
+export default {{classname}};
+{{/models}}

modules/openapi-generator/src/main/resources/Javascript/es6/partial_model_inner_enum.mustache

@@ -3,7 +3,7 @@
  * @enum {{=<% %>=}}{<%datatype%>}<%={{ }}=%>
  * @readonly
  */{{/emitJSDoc}}
-    static {{datatypeWithEnum}} = {
+{{classname}}['{{datatypeWithEnum}}'] = {
 {{#allowableValues}}{{#enumVars}}
     {{#emitJSDoc}}/**
      * value: {{{value}}}

pom.xml

@@ -571,6 +571,42 @@
                 <module>samples/client/petstore/javascript</module>
             </modules>
         </profile>
+        <profile>
+            <id>javascript-client-es6</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>javascript</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/javascript-es6</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>javascript-client-promise</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>javascript</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/javascript-promise</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>javascript-client-promise-es6</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>javascript</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/javascript-promise-es6</module>
+            </modules>
+        </profile>
         <profile>
             <id>scala-client</id>
             <activation>
@@ -904,6 +940,9 @@
                 <module>samples/client/petstore/scala</module>
                 <module>samples/client/petstore/akka-scala</module>
                 <module>samples/client/petstore/javascript</module>
+                <module>samples/client/petstore/javascript-es6</module>
+                <module>samples/client/petstore/javascript-promise</module>
+                <module>samples/client/petstore/javascript-promise-es6</module>
                 <module>samples/client/petstore/python</module>
                 <module>samples/client/petstore/python-tornado</module>
                 <module>samples/client/petstore/python-asyncio</module>

samples/client/petstore/javascript-es6/pom.xml

@@ -0,0 +1,45 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-petstore-javascript-es6</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>OpenAPI Petstore JS Client (ES6)</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>mocha</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

samples/client/petstore/javascript-es6/src/ApiClient.js

@@ -27,7 +27,7 @@ import querystring from "querystring";
 * @alias module:ApiClient
 * @class
 */
-export default class ApiClient {
+class ApiClient {
     constructor() {
         /**
          * The base URL against which to resolve every API call's (relative) path.
@@ -225,43 +225,6 @@ export default class ApiClient {
         return newParams;
     }
 
-    /**
-    * Enumeration of collection format separator strategies.
-    * @enum {String}
-    * @readonly
-    */
-    static CollectionFormatEnum = {
-        /**
-         * Comma-separated values. Value: <code>csv</code>
-         * @const
-         */
-        CSV: ',',
-
-        /**
-         * Space-separated values. Value: <code>ssv</code>
-         * @const
-         */
-        SSV: ' ',
-
-        /**
-         * Tab-separated values. Value: <code>tsv</code>
-         * @const
-         */
-        TSV: '\t',
-
-        /**
-         * Pipe(|)-separated values. Value: <code>pipes</code>
-         * @const
-         */
-        PIPES: '|',
-
-        /**
-         * Native array. Value: <code>multi</code>
-         * @const
-         */
-        MULTI: 'multi'
-    };
-
     /**
     * Builds a string representation of an array-type actual parameter, according to the given collection format.
     * @param {Array} param An array parameter.
@@ -581,8 +544,46 @@ export default class ApiClient {
     };
 }
 
+/**
+ * Enumeration of collection format separator strategies.
+ * @enum {String}
+ * @readonly
+ */
+ApiClient.CollectionFormatEnum = {
+    /**
+     * Comma-separated values. Value: <code>csv</code>
+     * @const
+     */
+    CSV: ',',
+
+    /**
+     * Space-separated values. Value: <code>ssv</code>
+     * @const
+     */
+    SSV: ' ',
+
+    /**
+     * Tab-separated values. Value: <code>tsv</code>
+     * @const
+     */
+    TSV: '\t',
+
+    /**
+     * Pipe(|)-separated values. Value: <code>pipes</code>
+     * @const
+     */
+    PIPES: '|',
+
+    /**
+     * Native array. Value: <code>multi</code>
+     * @const
+     */
+    MULTI: 'multi'
+};
+
 /**
 * The default API client implementation.
 * @type {module:ApiClient}
 */
 ApiClient.instance = new ApiClient();
+export default ApiClient;

samples/client/petstore/javascript-es6/src/api/FakeApi.js

@@ -68,7 +68,7 @@ export default class FakeApi {
       let authNames = [];
       let contentTypes = [];
       let accepts = ['*/*'];
-      let returnType = Boolean;
+      let returnType = 'Boolean';
 
       return this.apiClient.callApi(
         '/fake/outer/boolean', 'POST',
@@ -150,7 +150,7 @@ export default class FakeApi {
       let authNames = [];
       let contentTypes = [];
       let accepts = ['*/*'];
-      let returnType = Number;
+      let returnType = 'Number';
 
       return this.apiClient.callApi(
         '/fake/outer/number', 'POST',
@@ -191,7 +191,7 @@ export default class FakeApi {
       let authNames = [];
       let contentTypes = [];
       let accepts = ['*/*'];
-      let returnType = String;
+      let returnType = 'String';
 
       return this.apiClient.callApi(
         '/fake/outer/string', 'POST',

samples/client/petstore/javascript-es6/src/api/Fake_classname_tags123Api.js

@@ -1,82 +0,0 @@
-/**
- * Swagger Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- *
- */
-
-
-import ApiClient from "../ApiClient";
-import Client from '../model/Client';
-
-/**
-* Fake_classname_tags123 service.
-* @module api/Fake_classname_tags123Api
-* @version 1.0.0
-*/
-export default class Fake_classname_tags123Api {
-
-    /**
-    * Constructs a new Fake_classname_tags123Api. 
-    * @alias module:api/Fake_classname_tags123Api
-    * @class
-    * @param {module:ApiClient} [apiClient] Optional API client implementation to use,
-    * default to {@link module:ApiClient#instance} if unspecified.
-    */
-    constructor(apiClient) {
-        this.apiClient = apiClient || ApiClient.instance;
-    }
-
-
-    /**
-     * Callback function to receive the result of the testClassname operation.
-     * @callback module:api/Fake_classname_tags123Api~testClassnameCallback
-     * @param {String} error Error message, if any.
-     * @param {module:model/Client} data The data returned by the service call.
-     * @param {String} response The complete HTTP response.
-     */
-
-    /**
-     * To test class name in snake case
-     * @param {module:model/Client} body client model
-     * @param {module:api/Fake_classname_tags123Api~testClassnameCallback} callback The callback function, accepting three arguments: error, data, response
-     * data is of type: {@link module:model/Client}
-     */
-    testClassname(body, callback) {
-      let postBody = body;
-
-      // verify the required parameter 'body' is set
-      if (body === undefined || body === null) {
-        throw new Error("Missing the required parameter 'body' when calling testClassname");
-      }
-
-
-      let pathParams = {
-      };
-      let queryParams = {
-      };
-      let headerParams = {
-      };
-      let formParams = {
-      };
-
-      let authNames = ['api_key_query'];
-      let contentTypes = ['application/json'];
-      let accepts = ['application/json'];
-      let returnType = Client;
-
-      return this.apiClient.callApi(
-        '/fake_classname_test', 'PATCH',
-        pathParams, queryParams, headerParams, formParams, postBody,
-        authNames, contentTypes, accepts, returnType, callback
-      );
-    }
-
-
-}

samples/client/petstore/javascript-es6/src/api/StoreApi.js

@@ -109,7 +109,7 @@ export default class StoreApi {
       let authNames = ['api_key'];
       let contentTypes = [];
       let accepts = ['application/json'];
-      let returnType = {String: Number};
+      let returnType = {'String': 'Number'};
 
       return this.apiClient.callApi(
         '/store/inventory', 'GET',

samples/client/petstore/javascript-es6/src/api/UserApi.js

@@ -297,7 +297,7 @@ export default class UserApi {
       let authNames = [];
       let contentTypes = [];
       let accepts = ['application/xml', 'application/json'];
-      let returnType = String;
+      let returnType = 'String';
 
       return this.apiClient.callApi(
         '/user/login', 'GET',

samples/client/petstore/javascript-es6/src/model/AdditionalPropertiesClass.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The AdditionalPropertiesClass model module.
  * @module model/AdditionalPropertiesClass
  * @version 1.0.0
  */
-export default class AdditionalPropertiesClass {
+class AdditionalPropertiesClass {
     /**
      * Constructs a new <code>AdditionalPropertiesClass</code>.
      * @alias module:model/AdditionalPropertiesClass
-    * @class
      */
-
     constructor() { 
         
+        AdditionalPropertiesClass.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class AdditionalPropertiesClass {
         if (data) {
             obj = obj || new AdditionalPropertiesClass();
 
-            
-            
-            
-
             if (data.hasOwnProperty('map_property')) {
                 obj['map_property'] = ApiClient.convertToType(data['map_property'], {'String': 'String'});
             }
@@ -66,22 +57,23 @@ export default class AdditionalPropertiesClass {
         return obj;
     }
 
-    /**
-    * @member {Object.<String, String>} map_property
-    */
-    map_property = undefined;
-    /**
-    * @member {Object.<String, Object.<String, String>>} map_of_map_property
-    */
-    map_of_map_property = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Object.<String, String>} map_property
+ */
+AdditionalPropertiesClass.prototype['map_property'] = undefined;
+
+/**
+ * @member {Object.<String, Object.<String, String>>} map_of_map_property
+ */
+AdditionalPropertiesClass.prototype['map_of_map_property'] = undefined;
+
+
+
+
+
+
+export default AdditionalPropertiesClass;
 

samples/client/petstore/javascript-es6/src/model/Animal.js

@@ -11,35 +11,31 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The Animal model module.
  * @module model/Animal
  * @version 1.0.0
  */
-export default class Animal {
+class Animal {
     /**
      * Constructs a new <code>Animal</code>.
      * @alias module:model/Animal
-    * @class
      * @param className {String} 
      */
-
     constructor(className) { 
         
+        Animal.initialize(this, className);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        this['className'] = className;
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj, className) { 
+        obj['className'] = className;
     }
 
     /**
@@ -53,10 +49,6 @@ export default class Animal {
         if (data) {
             obj = obj || new Animal();
 
-            
-            
-            
-
             if (data.hasOwnProperty('className')) {
                 obj['className'] = ApiClient.convertToType(data['className'], 'String');
             }
@@ -67,23 +59,24 @@ export default class Animal {
         return obj;
     }
 
+
+}
+
 /**
  * @member {String} className
  */
-    className = undefined;
+Animal.prototype['className'] = undefined;
+
 /**
  * @member {String} color
  * @default 'red'
  */
-    color = 'red';
+Animal.prototype['color'] = 'red';
 
 
 
 
 
 
-
+export default Animal;
-
-}
-
 

samples/client/petstore/javascript-es6/src/model/AnimalFarm.js

@@ -11,38 +11,33 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 import Animal from './Animal';
 
-
-
-
-
 /**
  * The AnimalFarm model module.
  * @module model/AnimalFarm
  * @version 1.0.0
  */
-export default class AnimalFarm extends Array {
+class AnimalFarm extends Array {
     /**
      * Constructs a new <code>AnimalFarm</code>.
      * @alias module:model/AnimalFarm
-    * @class
      * @extends Array
      */
-
     constructor() { 
-        
         super();
         
         
+        AnimalFarm.initialize(this);
+    }
 
-        
+    /**
-
+     * Initializes the fields of this object.
-        
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-
+     * Only for internal use.
-        return this;
+     */
+    static initialize(obj) { 
     }
 
     /**
@@ -59,20 +54,17 @@ export default class AnimalFarm extends Array {
             ApiClient.constructFromObject(data, obj, 'Animal');
             
 
-            
-
         }
         return obj;
     }
 
 
-
-
-
-
-
-
-
 }
 
 
+
+
+
+
+export default AnimalFarm;
+

samples/client/petstore/javascript-es6/src/model/ApiResponse.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The ApiResponse model module.
  * @module model/ApiResponse
  * @version 1.0.0
  */
-export default class ApiResponse {
+class ApiResponse {
     /**
      * Constructs a new <code>ApiResponse</code>.
      * @alias module:model/ApiResponse
-    * @class
      */
-
     constructor() { 
         
+        ApiResponse.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class ApiResponse {
         if (data) {
             obj = obj || new ApiResponse();
 
-            
-            
-            
-
             if (data.hasOwnProperty('code')) {
                 obj['code'] = ApiClient.convertToType(data['code'], 'Number');
             }
@@ -69,26 +60,28 @@ export default class ApiResponse {
         return obj;
     }
 
-    /**
-    * @member {Number} code
-    */
-    code = undefined;
-    /**
-    * @member {String} type
-    */
-    type = undefined;
-    /**
-    * @member {String} message
-    */
-    message = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} code
+ */
+ApiResponse.prototype['code'] = undefined;
+
+/**
+ * @member {String} type
+ */
+ApiResponse.prototype['type'] = undefined;
+
+/**
+ * @member {String} message
+ */
+ApiResponse.prototype['message'] = undefined;
+
+
+
+
+
+
+export default ApiResponse;
 

samples/client/petstore/javascript-es6/src/model/ArrayOfArrayOfNumberOnly.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The ArrayOfArrayOfNumberOnly model module.
  * @module model/ArrayOfArrayOfNumberOnly
  * @version 1.0.0
  */
-export default class ArrayOfArrayOfNumberOnly {
+class ArrayOfArrayOfNumberOnly {
     /**
      * Constructs a new <code>ArrayOfArrayOfNumberOnly</code>.
      * @alias module:model/ArrayOfArrayOfNumberOnly
-    * @class
      */
-
     constructor() { 
         
+        ArrayOfArrayOfNumberOnly.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class ArrayOfArrayOfNumberOnly {
         if (data) {
             obj = obj || new ArrayOfArrayOfNumberOnly();
 
-            
-            
-            
-
             if (data.hasOwnProperty('ArrayArrayNumber')) {
                 obj['ArrayArrayNumber'] = ApiClient.convertToType(data['ArrayArrayNumber'], [['Number']]);
             }
@@ -63,18 +54,18 @@ export default class ArrayOfArrayOfNumberOnly {
         return obj;
     }
 
-    /**
-    * @member {Array.<Array.<Number>>} ArrayArrayNumber
-    */
-    ArrayArrayNumber = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Array.<Array.<Number>>} ArrayArrayNumber
+ */
+ArrayOfArrayOfNumberOnly.prototype['ArrayArrayNumber'] = undefined;
+
+
+
+
+
+
+export default ArrayOfArrayOfNumberOnly;
 

samples/client/petstore/javascript-es6/src/model/ArrayOfNumberOnly.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The ArrayOfNumberOnly model module.
  * @module model/ArrayOfNumberOnly
  * @version 1.0.0
  */
-export default class ArrayOfNumberOnly {
+class ArrayOfNumberOnly {
     /**
      * Constructs a new <code>ArrayOfNumberOnly</code>.
      * @alias module:model/ArrayOfNumberOnly
-    * @class
      */
-
     constructor() { 
         
+        ArrayOfNumberOnly.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class ArrayOfNumberOnly {
         if (data) {
             obj = obj || new ArrayOfNumberOnly();
 
-            
-            
-            
-
             if (data.hasOwnProperty('ArrayNumber')) {
                 obj['ArrayNumber'] = ApiClient.convertToType(data['ArrayNumber'], ['Number']);
             }
@@ -63,18 +54,18 @@ export default class ArrayOfNumberOnly {
         return obj;
     }
 
-    /**
-    * @member {Array.<Number>} ArrayNumber
-    */
-    ArrayNumber = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Array.<Number>} ArrayNumber
+ */
+ArrayOfNumberOnly.prototype['ArrayNumber'] = undefined;
+
+
+
+
+
+
+export default ArrayOfNumberOnly;
 

samples/client/petstore/javascript-es6/src/model/ArrayTest.js

@@ -11,35 +11,30 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 import ReadOnlyFirst from './ReadOnlyFirst';
 
-
-
-
-
 /**
  * The ArrayTest model module.
  * @module model/ArrayTest
  * @version 1.0.0
  */
-export default class ArrayTest {
+class ArrayTest {
     /**
      * Constructs a new <code>ArrayTest</code>.
      * @alias module:model/ArrayTest
-    * @class
      */
-
     constructor() { 
         
+        ArrayTest.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -53,10 +48,6 @@ export default class ArrayTest {
         if (data) {
             obj = obj || new ArrayTest();
 
-            
-            
-            
-
             if (data.hasOwnProperty('array_of_string')) {
                 obj['array_of_string'] = ApiClient.convertToType(data['array_of_string'], ['String']);
             }
@@ -70,26 +61,28 @@ export default class ArrayTest {
         return obj;
     }
 
-    /**
-    * @member {Array.<String>} array_of_string
-    */
-    array_of_string = undefined;
-    /**
-    * @member {Array.<Array.<Number>>} array_array_of_integer
-    */
-    array_array_of_integer = undefined;
-    /**
-    * @member {Array.<Array.<module:model/ReadOnlyFirst>>} array_array_of_model
-    */
-    array_array_of_model = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Array.<String>} array_of_string
+ */
+ArrayTest.prototype['array_of_string'] = undefined;
+
+/**
+ * @member {Array.<Array.<Number>>} array_array_of_integer
+ */
+ArrayTest.prototype['array_array_of_integer'] = undefined;
+
+/**
+ * @member {Array.<Array.<module:model/ReadOnlyFirst>>} array_array_of_model
+ */
+ArrayTest.prototype['array_array_of_model'] = undefined;
+
+
+
+
+
+
+export default ArrayTest;
 

samples/client/petstore/javascript-es6/src/model/Capitalization.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The Capitalization model module.
  * @module model/Capitalization
  * @version 1.0.0
  */
-export default class Capitalization {
+class Capitalization {
     /**
      * Constructs a new <code>Capitalization</code>.
      * @alias module:model/Capitalization
-    * @class
      */
-
     constructor() { 
         
+        Capitalization.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class Capitalization {
         if (data) {
             obj = obj || new Capitalization();
 
-            
-            
-            
-
             if (data.hasOwnProperty('smallCamel')) {
                 obj['smallCamel'] = ApiClient.convertToType(data['smallCamel'], 'String');
             }
@@ -78,39 +69,44 @@ export default class Capitalization {
         return obj;
     }
 
+
+}
+
 /**
  * @member {String} smallCamel
  */
-    smallCamel = undefined;
+Capitalization.prototype['smallCamel'] = undefined;
+
 /**
  * @member {String} CapitalCamel
  */
-    CapitalCamel = undefined;
+Capitalization.prototype['CapitalCamel'] = undefined;
+
 /**
  * @member {String} small_Snake
  */
-    small_Snake = undefined;
+Capitalization.prototype['small_Snake'] = undefined;
+
 /**
  * @member {String} Capital_Snake
  */
-    Capital_Snake = undefined;
+Capitalization.prototype['Capital_Snake'] = undefined;
+
 /**
  * @member {String} SCA_ETH_Flow_Points
  */
-    SCA_ETH_Flow_Points = undefined;
+Capitalization.prototype['SCA_ETH_Flow_Points'] = undefined;
+
 /**
  * Name of the pet 
  * @member {String} ATT_NAME
  */
-    ATT_NAME = undefined;
+Capitalization.prototype['ATT_NAME'] = undefined;
 
 
 
 
 
 
-
+export default Capitalization;
-
-}
-
 

samples/client/petstore/javascript-es6/src/model/Cat.js

@@ -11,38 +11,33 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 import Animal from './Animal';
 
-
-
-
-
 /**
  * The Cat model module.
  * @module model/Cat
  * @version 1.0.0
  */
-export default class Cat {
+class Cat {
     /**
      * Constructs a new <code>Cat</code>.
      * @alias module:model/Cat
-    * @class
      * @extends module:model/Animal
      * @implements module:model/Animal
      * @param className {} 
      */
-
     constructor(className) { 
+        Animal.initialize(this, className);
+        Cat.initialize(this, className);
+    }
 
-
+    /**
-        Animal.call(this, className);
+     * Initializes the fields of this object.
-        Animal.call(this, className);
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-
+     * Only for internal use.
-        
+     */
-
+    static initialize(obj, className) { 
-        
     }
 
     /**
@@ -55,9 +50,6 @@ export default class Cat {
     static constructFromObject(data, obj) {
         if (data) {
             obj = obj || new Cat();
-
-            
-
             Animal.constructFromObject(data, obj);
             Animal.constructFromObject(data, obj);
 
@@ -68,29 +60,28 @@ export default class Cat {
         return obj;
     }
 
+
+}
+
 /**
  * @member {Boolean} declawed
  */
-    declawed = undefined;
+Cat.prototype['declawed'] = undefined;
 
 
 // Implement Animal interface:
 /**
  * @member {String} className
  */
-    className = undefined;
+Animal.prototype['className'] = undefined;
 /**
  * @member {String} color
  * @default 'red'
  */
-    color = 'red';
+Animal.prototype['color'] = 'red';
 
 
 
 
-
+export default Cat;
-
-
-}
-
 

samples/client/petstore/javascript-es6/src/model/Category.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The Category model module.
  * @module model/Category
  * @version 1.0.0
  */
-export default class Category {
+class Category {
     /**
      * Constructs a new <code>Category</code>.
      * @alias module:model/Category
-    * @class
      */
-
     constructor() { 
         
+        Category.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class Category {
         if (data) {
             obj = obj || new Category();
 
-            
-            
-            
-
             if (data.hasOwnProperty('id')) {
                 obj['id'] = ApiClient.convertToType(data['id'], 'Number');
             }
@@ -66,22 +57,23 @@ export default class Category {
         return obj;
     }
 
-    /**
-    * @member {Number} id
-    */
-    id = undefined;
-    /**
-    * @member {String} name
-    */
-    name = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} id
+ */
+Category.prototype['id'] = undefined;
+
+/**
+ * @member {String} name
+ */
+Category.prototype['name'] = undefined;
+
+
+
+
+
+
+export default Category;
 

samples/client/petstore/javascript-es6/src/model/ClassModel.js

@@ -11,35 +11,30 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The ClassModel model module.
  * @module model/ClassModel
  * @version 1.0.0
  */
-export default class ClassModel {
+class ClassModel {
     /**
      * Constructs a new <code>ClassModel</code>.
      * Model for testing model with \&quot;_class\&quot; property
      * @alias module:model/ClassModel
-    * @class
      */
-
     constructor() { 
         
+        ClassModel.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -53,10 +48,6 @@ export default class ClassModel {
         if (data) {
             obj = obj || new ClassModel();
 
-            
-            
-            
-
             if (data.hasOwnProperty('_class')) {
                 obj['_class'] = ApiClient.convertToType(data['_class'], 'String');
             }
@@ -64,18 +55,18 @@ export default class ClassModel {
         return obj;
     }
 
-    /**
-    * @member {String} _class
-    */
-    _class = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {String} _class
+ */
+ClassModel.prototype['_class'] = undefined;
+
+
+
+
+
+
+export default ClassModel;
 

samples/client/petstore/javascript-es6/src/model/Client.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The Client model module.
  * @module model/Client
  * @version 1.0.0
  */
-export default class Client {
+class Client {
     /**
      * Constructs a new <code>Client</code>.
      * @alias module:model/Client
-    * @class
      */
-
     constructor() { 
         
+        Client.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class Client {
         if (data) {
             obj = obj || new Client();
 
-            
-            
-            
-
             if (data.hasOwnProperty('client')) {
                 obj['client'] = ApiClient.convertToType(data['client'], 'String');
             }
@@ -63,18 +54,18 @@ export default class Client {
         return obj;
     }
 
-    /**
-    * @member {String} client
-    */
-    client = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {String} client
+ */
+Client.prototype['client'] = undefined;
+
+
+
+
+
+
+export default Client;
 

samples/client/petstore/javascript-es6/src/model/Dog.js

@@ -11,38 +11,33 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 import Animal from './Animal';
 
-
-
-
-
 /**
  * The Dog model module.
  * @module model/Dog
  * @version 1.0.0
  */
-export default class Dog {
+class Dog {
     /**
      * Constructs a new <code>Dog</code>.
      * @alias module:model/Dog
-    * @class
      * @extends module:model/Animal
      * @implements module:model/Animal
      * @param className {} 
      */
-
     constructor(className) { 
+        Animal.initialize(this, className);
+        Dog.initialize(this, className);
+    }
 
-
+    /**
-        Animal.call(this, className);
+     * Initializes the fields of this object.
-        Animal.call(this, className);
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-
+     * Only for internal use.
-        
+     */
-
+    static initialize(obj, className) { 
-        
     }
 
     /**
@@ -55,9 +50,6 @@ export default class Dog {
     static constructFromObject(data, obj) {
         if (data) {
             obj = obj || new Dog();
-
-            
-
             Animal.constructFromObject(data, obj);
             Animal.constructFromObject(data, obj);
 
@@ -68,29 +60,28 @@ export default class Dog {
         return obj;
     }
 
+
+}
+
 /**
  * @member {String} breed
  */
-    breed = undefined;
+Dog.prototype['breed'] = undefined;
 
 
 // Implement Animal interface:
 /**
  * @member {String} className
  */
-    className = undefined;
+Animal.prototype['className'] = undefined;
 /**
  * @member {String} color
  * @default 'red'
  */
-    color = 'red';
+Animal.prototype['color'] = 'red';
 
 
 
 
-
+export default Dog;
-
-
-}
-
 

samples/client/petstore/javascript-es6/src/model/EnumArrays.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The EnumArrays model module.
  * @module model/EnumArrays
  * @version 1.0.0
  */
-export default class EnumArrays {
+class EnumArrays {
     /**
      * Constructs a new <code>EnumArrays</code>.
      * @alias module:model/EnumArrays
-    * @class
      */
-
     constructor() { 
         
+        EnumArrays.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class EnumArrays {
         if (data) {
             obj = obj || new EnumArrays();
 
-            
-            
-            
-
             if (data.hasOwnProperty('just_symbol')) {
                 obj['just_symbol'] = ApiClient.convertToType(data['just_symbol'], 'String');
             }
@@ -66,15 +57,18 @@ export default class EnumArrays {
         return obj;
     }
 
+
+}
+
 /**
  * @member {module:model/EnumArrays.JustSymbolEnum} just_symbol
  */
-    just_symbol = undefined;
+EnumArrays.prototype['just_symbol'] = undefined;
+
 /**
  * @member {Array.<module:model/EnumArrays.ArrayEnumEnum>} array_enum
  */
-    array_enum = undefined;
+EnumArrays.prototype['array_enum'] = undefined;
-
 
 
 
@@ -85,7 +79,7 @@ export default class EnumArrays {
  * @enum {String}
  * @readonly
  */
-    static JustSymbolEnum = {
+EnumArrays['JustSymbolEnum'] = {
 
     /**
      * value: ">="
@@ -100,12 +94,13 @@ export default class EnumArrays {
     "DOLLAR": "$"
 };
 
+
 /**
  * Allowed values for the <code>arrayEnum</code> property.
  * @enum {String}
  * @readonly
  */
-    static ArrayEnumEnum = {
+EnumArrays['ArrayEnumEnum'] = {
 
     /**
      * value: "fish"
@@ -122,6 +117,5 @@ export default class EnumArrays {
 
 
 
-}
+export default EnumArrays;
-
 

samples/client/petstore/javascript-es6/src/model/EnumClass.js

@@ -11,10 +11,7 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
-
-
 /**
 * Enum class EnumClass.
 * @enum {}
@@ -26,21 +23,21 @@ export default class EnumClass {
          * value: "_abc"
          * @const
          */
-        _abc = "_abc";
+        "_abc" = "_abc";
 
     
         /**
          * value: "-efg"
          * @const
          */
-        -efg = "-efg";
+        "-efg" = "-efg";
 
     
         /**
          * value: "(xyz)"
          * @const
          */
-        (xyz) = "(xyz)";
+        "(xyz)" = "(xyz)";
 
     
 
@@ -54,4 +51,3 @@ export default class EnumClass {
     }
 }
 
-

samples/client/petstore/javascript-es6/src/model/EnumTest.js

@@ -11,36 +11,32 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 import OuterEnum from './OuterEnum';
 
-
-
-
-
 /**
  * The EnumTest model module.
  * @module model/EnumTest
  * @version 1.0.0
  */
-export default class EnumTest {
+class EnumTest {
     /**
      * Constructs a new <code>EnumTest</code>.
      * @alias module:model/EnumTest
-    * @class
      * @param enumStringRequired {module:model/EnumTest.EnumStringRequiredEnum} 
      */
-
     constructor(enumStringRequired) { 
         
+        EnumTest.initialize(this, enumStringRequired);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        this['enum_string_required'] = enumStringRequired;
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj, enumStringRequired) { 
+        obj['enum_string_required'] = enumStringRequired;
     }
 
     /**
@@ -54,10 +50,6 @@ export default class EnumTest {
         if (data) {
             obj = obj || new EnumTest();
 
-            
-            
-            
-
             if (data.hasOwnProperty('enum_string')) {
                 obj['enum_string'] = ApiClient.convertToType(data['enum_string'], 'String');
             }
@@ -77,27 +69,33 @@ export default class EnumTest {
         return obj;
     }
 
+
+}
+
 /**
  * @member {module:model/EnumTest.EnumStringEnum} enum_string
  */
-    enum_string = undefined;
+EnumTest.prototype['enum_string'] = undefined;
+
 /**
  * @member {module:model/EnumTest.EnumStringRequiredEnum} enum_string_required
  */
-    enum_string_required = undefined;
+EnumTest.prototype['enum_string_required'] = undefined;
+
 /**
  * @member {module:model/EnumTest.EnumIntegerEnum} enum_integer
  */
-    enum_integer = undefined;
+EnumTest.prototype['enum_integer'] = undefined;
+
 /**
  * @member {module:model/EnumTest.EnumNumberEnum} enum_number
  */
-    enum_number = undefined;
+EnumTest.prototype['enum_number'] = undefined;
+
 /**
  * @member {module:model/OuterEnum} outerEnum
  */
-    outerEnum = undefined;
+EnumTest.prototype['outerEnum'] = undefined;
-
 
 
 
@@ -108,7 +106,7 @@ export default class EnumTest {
  * @enum {String}
  * @readonly
  */
-    static EnumStringEnum = {
+EnumTest['EnumStringEnum'] = {
 
     /**
      * value: "UPPER"
@@ -129,12 +127,13 @@ export default class EnumTest {
     "empty": ""
 };
 
+
 /**
  * Allowed values for the <code>enum_string_required</code> property.
  * @enum {String}
  * @readonly
  */
-    static EnumStringRequiredEnum = {
+EnumTest['EnumStringRequiredEnum'] = {
 
     /**
      * value: "UPPER"
@@ -155,12 +154,13 @@ export default class EnumTest {
     "empty": ""
 };
 
+
 /**
  * Allowed values for the <code>enum_integer</code> property.
  * @enum {Number}
  * @readonly
  */
-    static EnumIntegerEnum = {
+EnumTest['EnumIntegerEnum'] = {
 
     /**
      * value: 1
@@ -175,12 +175,13 @@ export default class EnumTest {
     "-1": -1
 };
 
+
 /**
  * Allowed values for the <code>enum_number</code> property.
  * @enum {Number}
  * @readonly
  */
-    static EnumNumberEnum = {
+EnumTest['EnumNumberEnum'] = {
 
     /**
      * value: 1.1
@@ -197,6 +198,5 @@ export default class EnumTest {
 
 
 
-}
+export default EnumTest;
-
 

samples/client/petstore/javascript-es6/src/model/FormatTest.js

@@ -11,38 +11,37 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The FormatTest model module.
  * @module model/FormatTest
  * @version 1.0.0
  */
-export default class FormatTest {
+class FormatTest {
     /**
      * Constructs a new <code>FormatTest</code>.
      * @alias module:model/FormatTest
-    * @class
      * @param _number {Number} 
      * @param _byte {Blob} 
      * @param _date {Date} 
      * @param password {String} 
      */
-
     constructor(_number, _byte, _date, password) { 
         
+        FormatTest.initialize(this, _number, _byte, _date, password);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        this['number'] = _number;this['byte'] = _byte;this['date'] = _date;this['password'] = password;
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj, _number, _byte, _date, password) { 
+        obj['number'] = _number;
+        obj['byte'] = _byte;
+        obj['date'] = _date;
+        obj['password'] = password;
     }
 
     /**
@@ -56,10 +55,6 @@ export default class FormatTest {
         if (data) {
             obj = obj || new FormatTest();
 
-            
-            
-            
-
             if (data.hasOwnProperty('integer')) {
                 obj['integer'] = ApiClient.convertToType(data['integer'], 'Number');
             }
@@ -103,66 +98,78 @@ export default class FormatTest {
         return obj;
     }
 
-    /**
-    * @member {Number} integer
-    */
-    integer = undefined;
-    /**
-    * @member {Number} int32
-    */
-    int32 = undefined;
-    /**
-    * @member {Number} int64
-    */
-    int64 = undefined;
-    /**
-    * @member {Number} number
-    */
-    number = undefined;
-    /**
-    * @member {Number} float
-    */
-    float = undefined;
-    /**
-    * @member {Number} double
-    */
-    double = undefined;
-    /**
-    * @member {String} string
-    */
-    string = undefined;
-    /**
-    * @member {Blob} byte
-    */
-    byte = undefined;
-    /**
-    * @member {File} binary
-    */
-    binary = undefined;
-    /**
-    * @member {Date} date
-    */
-    date = undefined;
-    /**
-    * @member {Date} dateTime
-    */
-    dateTime = undefined;
-    /**
-    * @member {String} uuid
-    */
-    uuid = undefined;
-    /**
-    * @member {String} password
-    */
-    password = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} integer
+ */
+FormatTest.prototype['integer'] = undefined;
+
+/**
+ * @member {Number} int32
+ */
+FormatTest.prototype['int32'] = undefined;
+
+/**
+ * @member {Number} int64
+ */
+FormatTest.prototype['int64'] = undefined;
+
+/**
+ * @member {Number} number
+ */
+FormatTest.prototype['number'] = undefined;
+
+/**
+ * @member {Number} float
+ */
+FormatTest.prototype['float'] = undefined;
+
+/**
+ * @member {Number} double
+ */
+FormatTest.prototype['double'] = undefined;
+
+/**
+ * @member {String} string
+ */
+FormatTest.prototype['string'] = undefined;
+
+/**
+ * @member {Blob} byte
+ */
+FormatTest.prototype['byte'] = undefined;
+
+/**
+ * @member {File} binary
+ */
+FormatTest.prototype['binary'] = undefined;
+
+/**
+ * @member {Date} date
+ */
+FormatTest.prototype['date'] = undefined;
+
+/**
+ * @member {Date} dateTime
+ */
+FormatTest.prototype['dateTime'] = undefined;
+
+/**
+ * @member {String} uuid
+ */
+FormatTest.prototype['uuid'] = undefined;
+
+/**
+ * @member {String} password
+ */
+FormatTest.prototype['password'] = undefined;
+
+
+
+
+
+
+export default FormatTest;
 

samples/client/petstore/javascript-es6/src/model/HasOnlyReadOnly.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The HasOnlyReadOnly model module.
  * @module model/HasOnlyReadOnly
  * @version 1.0.0
  */
-export default class HasOnlyReadOnly {
+class HasOnlyReadOnly {
     /**
      * Constructs a new <code>HasOnlyReadOnly</code>.
      * @alias module:model/HasOnlyReadOnly
-    * @class
      */
-
     constructor() { 
         
+        HasOnlyReadOnly.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class HasOnlyReadOnly {
         if (data) {
             obj = obj || new HasOnlyReadOnly();
 
-            
-            
-            
-
             if (data.hasOwnProperty('bar')) {
                 obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
             }
@@ -66,22 +57,23 @@ export default class HasOnlyReadOnly {
         return obj;
     }
 
-    /**
-    * @member {String} bar
-    */
-    bar = undefined;
-    /**
-    * @member {String} foo
-    */
-    foo = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {String} bar
+ */
+HasOnlyReadOnly.prototype['bar'] = undefined;
+
+/**
+ * @member {String} foo
+ */
+HasOnlyReadOnly.prototype['foo'] = undefined;
+
+
+
+
+
+
+export default HasOnlyReadOnly;
 

samples/client/petstore/javascript-es6/src/model/List.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The List model module.
  * @module model/List
  * @version 1.0.0
  */
-export default class List {
+class List {
     /**
      * Constructs a new <code>List</code>.
      * @alias module:model/List
-    * @class
      */
-
     constructor() { 
         
+        List.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class List {
         if (data) {
             obj = obj || new List();
 
-            
-            
-            
-
             if (data.hasOwnProperty('123-list')) {
                 obj['123-list'] = ApiClient.convertToType(data['123-list'], 'String');
             }
@@ -63,18 +54,18 @@ export default class List {
         return obj;
     }
 
-    /**
-    * @member {String} 123-list
-    */
-    123-list = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {String} 123-list
+ */
+List.prototype['123-list'] = undefined;
+
+
+
+
+
+
+export default List;
 

samples/client/petstore/javascript-es6/src/model/MapTest.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The MapTest model module.
  * @module model/MapTest
  * @version 1.0.0
  */
-export default class MapTest {
+class MapTest {
     /**
      * Constructs a new <code>MapTest</code>.
      * @alias module:model/MapTest
-    * @class
      */
-
     constructor() { 
         
+        MapTest.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class MapTest {
         if (data) {
             obj = obj || new MapTest();
 
-            
-            
-            
-
             if (data.hasOwnProperty('map_map_of_string')) {
                 obj['map_map_of_string'] = ApiClient.convertToType(data['map_map_of_string'], {'String': {'String': 'String'}});
             }
@@ -66,15 +57,18 @@ export default class MapTest {
         return obj;
     }
 
+
+}
+
 /**
  * @member {Object.<String, Object.<String, String>>} map_map_of_string
  */
-    map_map_of_string = undefined;
+MapTest.prototype['map_map_of_string'] = undefined;
+
 /**
  * @member {Object.<String, module:model/MapTest.InnerEnum>} map_of_enum_string
  */
-    map_of_enum_string = undefined;
+MapTest.prototype['map_of_enum_string'] = undefined;
-
 
 
 
@@ -85,7 +79,7 @@ export default class MapTest {
  * @enum {String}
  * @readonly
  */
-    static InnerEnum = {
+MapTest['InnerEnum'] = {
 
     /**
      * value: "UPPER"
@@ -102,6 +96,5 @@ export default class MapTest {
 
 
 
-}
+export default MapTest;
-
 

samples/client/petstore/javascript-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js

@@ -11,35 +11,30 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 import Animal from './Animal';
 
-
-
-
-
 /**
  * The MixedPropertiesAndAdditionalPropertiesClass model module.
  * @module model/MixedPropertiesAndAdditionalPropertiesClass
  * @version 1.0.0
  */
-export default class MixedPropertiesAndAdditionalPropertiesClass {
+class MixedPropertiesAndAdditionalPropertiesClass {
     /**
      * Constructs a new <code>MixedPropertiesAndAdditionalPropertiesClass</code>.
      * @alias module:model/MixedPropertiesAndAdditionalPropertiesClass
-    * @class
      */
-
     constructor() { 
         
+        MixedPropertiesAndAdditionalPropertiesClass.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -53,10 +48,6 @@ export default class MixedPropertiesAndAdditionalPropertiesClass {
         if (data) {
             obj = obj || new MixedPropertiesAndAdditionalPropertiesClass();
 
-            
-            
-            
-
             if (data.hasOwnProperty('uuid')) {
                 obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
             }
@@ -70,26 +61,28 @@ export default class MixedPropertiesAndAdditionalPropertiesClass {
         return obj;
     }
 
-    /**
-    * @member {String} uuid
-    */
-    uuid = undefined;
-    /**
-    * @member {Date} dateTime
-    */
-    dateTime = undefined;
-    /**
-    * @member {Object.<String, module:model/Animal>} map
-    */
-    map = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {String} uuid
+ */
+MixedPropertiesAndAdditionalPropertiesClass.prototype['uuid'] = undefined;
+
+/**
+ * @member {Date} dateTime
+ */
+MixedPropertiesAndAdditionalPropertiesClass.prototype['dateTime'] = undefined;
+
+/**
+ * @member {Object.<String, module:model/Animal>} map
+ */
+MixedPropertiesAndAdditionalPropertiesClass.prototype['map'] = undefined;
+
+
+
+
+
+
+export default MixedPropertiesAndAdditionalPropertiesClass;
 

samples/client/petstore/javascript-es6/src/model/Model200Response.js

@@ -11,35 +11,30 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The Model200Response model module.
  * @module model/Model200Response
  * @version 1.0.0
  */
-export default class Model200Response {
+class Model200Response {
     /**
      * Constructs a new <code>Model200Response</code>.
      * Model for testing model name starting with number
      * @alias module:model/Model200Response
-    * @class
      */
-
     constructor() { 
         
+        Model200Response.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -53,10 +48,6 @@ export default class Model200Response {
         if (data) {
             obj = obj || new Model200Response();
 
-            
-            
-            
-
             if (data.hasOwnProperty('name')) {
                 obj['name'] = ApiClient.convertToType(data['name'], 'Number');
             }
@@ -67,22 +58,23 @@ export default class Model200Response {
         return obj;
     }
 
-    /**
-    * @member {Number} name
-    */
-    name = undefined;
-    /**
-    * @member {String} class
-    */
-    class = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} name
+ */
+Model200Response.prototype['name'] = undefined;
+
+/**
+ * @member {String} class
+ */
+Model200Response.prototype['class'] = undefined;
+
+
+
+
+
+
+export default Model200Response;
 

samples/client/petstore/javascript-es6/src/model/ModelReturn.js

@@ -11,35 +11,30 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The ModelReturn model module.
  * @module model/ModelReturn
  * @version 1.0.0
  */
-export default class ModelReturn {
+class ModelReturn {
     /**
      * Constructs a new <code>ModelReturn</code>.
      * Model for testing reserved words
      * @alias module:model/ModelReturn
-    * @class
      */
-
     constructor() { 
         
+        ModelReturn.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -53,10 +48,6 @@ export default class ModelReturn {
         if (data) {
             obj = obj || new ModelReturn();
 
-            
-            
-            
-
             if (data.hasOwnProperty('return')) {
                 obj['return'] = ApiClient.convertToType(data['return'], 'Number');
             }
@@ -64,18 +55,18 @@ export default class ModelReturn {
         return obj;
     }
 
-    /**
-    * @member {Number} return
-    */
-    return = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} return
+ */
+ModelReturn.prototype['return'] = undefined;
+
+
+
+
+
+
+export default ModelReturn;
 

samples/client/petstore/javascript-es6/src/model/Name.js

@@ -11,36 +11,32 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The Name model module.
  * @module model/Name
  * @version 1.0.0
  */
-export default class Name {
+class Name {
     /**
      * Constructs a new <code>Name</code>.
      * Model for testing model name same as property name
      * @alias module:model/Name
-    * @class
      * @param name {Number} 
      */
-
     constructor(name) { 
         
+        Name.initialize(this, name);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        this['name'] = name;
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj, name) { 
+        obj['name'] = name;
     }
 
     /**
@@ -54,10 +50,6 @@ export default class Name {
         if (data) {
             obj = obj || new Name();
 
-            
-            
-            
-
             if (data.hasOwnProperty('name')) {
                 obj['name'] = ApiClient.convertToType(data['name'], 'Number');
             }
@@ -74,30 +66,33 @@ export default class Name {
         return obj;
     }
 
-    /**
-    * @member {Number} name
-    */
-    name = undefined;
-    /**
-    * @member {Number} snake_case
-    */
-    snake_case = undefined;
-    /**
-    * @member {String} property
-    */
-    property = undefined;
-    /**
-    * @member {Number} 123Number
-    */
-    123Number = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} name
+ */
+Name.prototype['name'] = undefined;
+
+/**
+ * @member {Number} snake_case
+ */
+Name.prototype['snake_case'] = undefined;
+
+/**
+ * @member {String} property
+ */
+Name.prototype['property'] = undefined;
+
+/**
+ * @member {Number} 123Number
+ */
+Name.prototype['123Number'] = undefined;
+
+
+
+
+
+
+export default Name;
 

samples/client/petstore/javascript-es6/src/model/NumberOnly.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The NumberOnly model module.
  * @module model/NumberOnly
  * @version 1.0.0
  */
-export default class NumberOnly {
+class NumberOnly {
     /**
      * Constructs a new <code>NumberOnly</code>.
      * @alias module:model/NumberOnly
-    * @class
      */
-
     constructor() { 
         
+        NumberOnly.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class NumberOnly {
         if (data) {
             obj = obj || new NumberOnly();
 
-            
-            
-            
-
             if (data.hasOwnProperty('JustNumber')) {
                 obj['JustNumber'] = ApiClient.convertToType(data['JustNumber'], 'Number');
             }
@@ -63,18 +54,18 @@ export default class NumberOnly {
         return obj;
     }
 
-    /**
-    * @member {Number} JustNumber
-    */
-    JustNumber = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} JustNumber
+ */
+NumberOnly.prototype['JustNumber'] = undefined;
+
+
+
+
+
+
+export default NumberOnly;
 

samples/client/petstore/javascript-es6/src/model/Order.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The Order model module.
  * @module model/Order
  * @version 1.0.0
  */
-export default class Order {
+class Order {
     /**
      * Constructs a new <code>Order</code>.
      * @alias module:model/Order
-    * @class
      */
-
     constructor() { 
         
+        Order.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class Order {
         if (data) {
             obj = obj || new Order();
 
-            
-            
-            
-
             if (data.hasOwnProperty('id')) {
                 obj['id'] = ApiClient.convertToType(data['id'], 'Number');
             }
@@ -78,33 +69,40 @@ export default class Order {
         return obj;
     }
 
+
+}
+
 /**
  * @member {Number} id
  */
-    id = undefined;
+Order.prototype['id'] = undefined;
+
 /**
  * @member {Number} petId
  */
-    petId = undefined;
+Order.prototype['petId'] = undefined;
+
 /**
  * @member {Number} quantity
  */
-    quantity = undefined;
+Order.prototype['quantity'] = undefined;
+
 /**
  * @member {Date} shipDate
  */
-    shipDate = undefined;
+Order.prototype['shipDate'] = undefined;
+
 /**
  * Order Status
  * @member {module:model/Order.StatusEnum} status
  */
-    status = undefined;
+Order.prototype['status'] = undefined;
+
 /**
  * @member {Boolean} complete
  * @default false
  */
-    complete = false;
+Order.prototype['complete'] = false;
-
 
 
 
@@ -115,7 +113,7 @@ export default class Order {
  * @enum {String}
  * @readonly
  */
-    static StatusEnum = {
+Order['StatusEnum'] = {
 
     /**
      * value: "placed"
@@ -138,6 +136,5 @@ export default class Order {
 
 
 
-}
+export default Order;
-
 

samples/client/petstore/javascript-es6/src/model/OuterBoolean.js

@@ -1,73 +0,0 @@
-/**
- * Swagger Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- *
- */
-
-
-import ApiClient from '../ApiClient';
-
-
-
-
-
-/**
-* The OuterBoolean model module.
-* @module model/OuterBoolean
-* @version 1.0.0
-*/
-export default class OuterBoolean {
-    /**
-    * Constructs a new <code>OuterBoolean</code>.
-    * @alias module:model/OuterBoolean
-    * @class
-    */
-
-    constructor() {
-        
-
-        
-        
-
-        
-
-        
-    }
-
-    /**
-    * Constructs a <code>OuterBoolean</code> from a plain JavaScript object, optionally creating a new instance.
-    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-    * @param {Object} data The plain JavaScript object bearing properties of interest.
-    * @param {module:model/OuterBoolean} obj Optional instance to populate.
-    * @return {module:model/OuterBoolean} The populated <code>OuterBoolean</code> instance.
-    */
-    static constructFromObject(data, obj) {
-        if (data) {
-            obj = obj || new OuterBoolean();
-
-            
-            
-            
-
-        }
-        return obj;
-    }
-
-
-
-
-
-
-
-
-
-}
-
-

samples/client/petstore/javascript-es6/src/model/OuterComposite.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The OuterComposite model module.
  * @module model/OuterComposite
  * @version 1.0.0
  */
-export default class OuterComposite {
+class OuterComposite {
     /**
      * Constructs a new <code>OuterComposite</code>.
      * @alias module:model/OuterComposite
-    * @class
      */
-
     constructor() { 
         
+        OuterComposite.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class OuterComposite {
         if (data) {
             obj = obj || new OuterComposite();
 
-            
-            
-            
-
             if (data.hasOwnProperty('my_number')) {
                 obj['my_number'] = 'Number'.constructFromObject(data['my_number']);
             }
@@ -69,26 +60,28 @@ export default class OuterComposite {
         return obj;
     }
 
-    /**
-    * @member {Number} my_number
-    */
-    my_number = undefined;
-    /**
-    * @member {String} my_string
-    */
-    my_string = undefined;
-    /**
-    * @member {Boolean} my_boolean
-    */
-    my_boolean = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} my_number
+ */
+OuterComposite.prototype['my_number'] = undefined;
+
+/**
+ * @member {String} my_string
+ */
+OuterComposite.prototype['my_string'] = undefined;
+
+/**
+ * @member {Boolean} my_boolean
+ */
+OuterComposite.prototype['my_boolean'] = undefined;
+
+
+
+
+
+
+export default OuterComposite;
 

samples/client/petstore/javascript-es6/src/model/OuterEnum.js

@@ -11,10 +11,7 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
-
-
 /**
 * Enum class OuterEnum.
 * @enum {}
@@ -26,21 +23,21 @@ export default class OuterEnum {
          * value: "placed"
          * @const
          */
-        placed = "placed";
+        "placed" = "placed";
 
     
         /**
          * value: "approved"
          * @const
          */
-        approved = "approved";
+        "approved" = "approved";
 
     
         /**
          * value: "delivered"
          * @const
          */
-        delivered = "delivered";
+        "delivered" = "delivered";
 
     
 
@@ -54,4 +51,3 @@ export default class OuterEnum {
     }
 }
 
-

samples/client/petstore/javascript-es6/src/model/OuterNumber.js

@@ -1,73 +0,0 @@
-/**
- * Swagger Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- *
- */
-
-
-import ApiClient from '../ApiClient';
-
-
-
-
-
-/**
-* The OuterNumber model module.
-* @module model/OuterNumber
-* @version 1.0.0
-*/
-export default class OuterNumber {
-    /**
-    * Constructs a new <code>OuterNumber</code>.
-    * @alias module:model/OuterNumber
-    * @class
-    */
-
-    constructor() {
-        
-
-        
-        
-
-        
-
-        
-    }
-
-    /**
-    * Constructs a <code>OuterNumber</code> from a plain JavaScript object, optionally creating a new instance.
-    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-    * @param {Object} data The plain JavaScript object bearing properties of interest.
-    * @param {module:model/OuterNumber} obj Optional instance to populate.
-    * @return {module:model/OuterNumber} The populated <code>OuterNumber</code> instance.
-    */
-    static constructFromObject(data, obj) {
-        if (data) {
-            obj = obj || new OuterNumber();
-
-            
-            
-            
-
-        }
-        return obj;
-    }
-
-
-
-
-
-
-
-
-
-}
-
-

samples/client/petstore/javascript-es6/src/model/OuterString.js

@@ -1,73 +0,0 @@
-/**
- * Swagger Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- *
- */
-
-
-import ApiClient from '../ApiClient';
-
-
-
-
-
-/**
-* The OuterString model module.
-* @module model/OuterString
-* @version 1.0.0
-*/
-export default class OuterString {
-    /**
-    * Constructs a new <code>OuterString</code>.
-    * @alias module:model/OuterString
-    * @class
-    */
-
-    constructor() {
-        
-
-        
-        
-
-        
-
-        
-    }
-
-    /**
-    * Constructs a <code>OuterString</code> from a plain JavaScript object, optionally creating a new instance.
-    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-    * @param {Object} data The plain JavaScript object bearing properties of interest.
-    * @param {module:model/OuterString} obj Optional instance to populate.
-    * @return {module:model/OuterString} The populated <code>OuterString</code> instance.
-    */
-    static constructFromObject(data, obj) {
-        if (data) {
-            obj = obj || new OuterString();
-
-            
-            
-            
-
-        }
-        return obj;
-    }
-
-
-
-
-
-
-
-
-
-}
-
-

samples/client/petstore/javascript-es6/src/model/Pet.js

@@ -11,38 +11,35 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 import Category from './Category';
 import Tag from './Tag';
 
-
-
-
-
 /**
  * The Pet model module.
  * @module model/Pet
  * @version 1.0.0
  */
-export default class Pet {
+class Pet {
     /**
      * Constructs a new <code>Pet</code>.
      * @alias module:model/Pet
-    * @class
      * @param name {String} 
      * @param photoUrls {Array.<String>} 
      */
-
     constructor(name, photoUrls) { 
         
+        Pet.initialize(this, name, photoUrls);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        this['name'] = name;this['photoUrls'] = photoUrls;
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj, name, photoUrls) { 
+        obj['name'] = name;
+        obj['photoUrls'] = photoUrls;
     }
 
     /**
@@ -56,10 +53,6 @@ export default class Pet {
         if (data) {
             obj = obj || new Pet();
 
-            
-            
-            
-
             if (data.hasOwnProperty('id')) {
                 obj['id'] = ApiClient.convertToType(data['id'], 'Number');
             }
@@ -82,32 +75,39 @@ export default class Pet {
         return obj;
     }
 
+
+}
+
 /**
  * @member {Number} id
  */
-    id = undefined;
+Pet.prototype['id'] = undefined;
+
 /**
  * @member {module:model/Category} category
  */
-    category = undefined;
+Pet.prototype['category'] = undefined;
+
 /**
  * @member {String} name
  */
-    name = undefined;
+Pet.prototype['name'] = undefined;
+
 /**
  * @member {Array.<String>} photoUrls
  */
-    photoUrls = undefined;
+Pet.prototype['photoUrls'] = undefined;
+
 /**
  * @member {Array.<module:model/Tag>} tags
  */
-    tags = undefined;
+Pet.prototype['tags'] = undefined;
+
 /**
  * pet status in the store
  * @member {module:model/Pet.StatusEnum} status
  */
-    status = undefined;
+Pet.prototype['status'] = undefined;
-
 
 
 
@@ -118,7 +118,7 @@ export default class Pet {
  * @enum {String}
  * @readonly
  */
-    static StatusEnum = {
+Pet['StatusEnum'] = {
 
     /**
      * value: "available"
@@ -141,6 +141,5 @@ export default class Pet {
 
 
 
-}
+export default Pet;
-
 

samples/client/petstore/javascript-es6/src/model/ReadOnlyFirst.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The ReadOnlyFirst model module.
  * @module model/ReadOnlyFirst
  * @version 1.0.0
  */
-export default class ReadOnlyFirst {
+class ReadOnlyFirst {
     /**
      * Constructs a new <code>ReadOnlyFirst</code>.
      * @alias module:model/ReadOnlyFirst
-    * @class
      */
-
     constructor() { 
         
+        ReadOnlyFirst.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class ReadOnlyFirst {
         if (data) {
             obj = obj || new ReadOnlyFirst();
 
-            
-            
-            
-
             if (data.hasOwnProperty('bar')) {
                 obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
             }
@@ -66,22 +57,23 @@ export default class ReadOnlyFirst {
         return obj;
     }
 
-    /**
-    * @member {String} bar
-    */
-    bar = undefined;
-    /**
-    * @member {String} baz
-    */
-    baz = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {String} bar
+ */
+ReadOnlyFirst.prototype['bar'] = undefined;
+
+/**
+ * @member {String} baz
+ */
+ReadOnlyFirst.prototype['baz'] = undefined;
+
+
+
+
+
+
+export default ReadOnlyFirst;
 

samples/client/petstore/javascript-es6/src/model/SpecialModelName.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The SpecialModelName model module.
  * @module model/SpecialModelName
  * @version 1.0.0
  */
-export default class SpecialModelName {
+class SpecialModelName {
     /**
      * Constructs a new <code>SpecialModelName</code>.
      * @alias module:model/SpecialModelName
-    * @class
      */
-
     constructor() { 
         
+        SpecialModelName.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class SpecialModelName {
         if (data) {
             obj = obj || new SpecialModelName();
 
-            
-            
-            
-
             if (data.hasOwnProperty('$special[property.name]')) {
                 obj['$special[property.name]'] = ApiClient.convertToType(data['$special[property.name]'], 'Number');
             }
@@ -63,18 +54,18 @@ export default class SpecialModelName {
         return obj;
     }
 
-    /**
-    * @member {Number} $special[property.name]
-    */
-    $special[property.name] = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} $special[property.name]
+ */
+SpecialModelName.prototype['$special[property.name]'] = undefined;
+
+
+
+
+
+
+export default SpecialModelName;
 

samples/client/petstore/javascript-es6/src/model/Tag.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The Tag model module.
  * @module model/Tag
  * @version 1.0.0
  */
-export default class Tag {
+class Tag {
     /**
      * Constructs a new <code>Tag</code>.
      * @alias module:model/Tag
-    * @class
      */
-
     constructor() { 
         
+        Tag.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class Tag {
         if (data) {
             obj = obj || new Tag();
 
-            
-            
-            
-
             if (data.hasOwnProperty('id')) {
                 obj['id'] = ApiClient.convertToType(data['id'], 'Number');
             }
@@ -66,22 +57,23 @@ export default class Tag {
         return obj;
     }
 
-    /**
-    * @member {Number} id
-    */
-    id = undefined;
-    /**
-    * @member {String} name
-    */
-    name = undefined;
-
-
-
-
-
-
-
 
 }
 
+/**
+ * @member {Number} id
+ */
+Tag.prototype['id'] = undefined;
+
+/**
+ * @member {String} name
+ */
+Tag.prototype['name'] = undefined;
+
+
+
+
+
+
+export default Tag;
 

samples/client/petstore/javascript-es6/src/model/User.js

@@ -11,34 +11,29 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
  * The User model module.
  * @module model/User
  * @version 1.0.0
  */
-export default class User {
+class User {
     /**
      * Constructs a new <code>User</code>.
      * @alias module:model/User
-    * @class
      */
-
     constructor() { 
         
+        User.initialize(this);
+    }
 
-        
+    /**
-        
+     * Initializes the fields of this object.
-
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
-        
+     * Only for internal use.
-
+     */
-        
+    static initialize(obj) { 
     }
 
     /**
@@ -52,10 +47,6 @@ export default class User {
         if (data) {
             obj = obj || new User();
 
-            
-            
-            
-
             if (data.hasOwnProperty('id')) {
                 obj['id'] = ApiClient.convertToType(data['id'], 'Number');
             }
@@ -84,47 +75,54 @@ export default class User {
         return obj;
     }
 
+
+}
+
 /**
  * @member {Number} id
  */
-    id = undefined;
+User.prototype['id'] = undefined;
+
 /**
  * @member {String} username
  */
-    username = undefined;
+User.prototype['username'] = undefined;
+
 /**
  * @member {String} firstName
  */
-    firstName = undefined;
+User.prototype['firstName'] = undefined;
+
 /**
  * @member {String} lastName
  */
-    lastName = undefined;
+User.prototype['lastName'] = undefined;
+
 /**
  * @member {String} email
  */
-    email = undefined;
+User.prototype['email'] = undefined;
+
 /**
  * @member {String} password
  */
-    password = undefined;
+User.prototype['password'] = undefined;
+
 /**
  * @member {String} phone
  */
-    phone = undefined;
+User.prototype['phone'] = undefined;
+
 /**
  * User Status
  * @member {Number} userStatus
  */
-    userStatus = undefined;
+User.prototype['userStatus'] = undefined;
 
 
 
 
 
 
-
+export default User;
-
-}
-
 

samples/client/petstore/javascript-es6/src/test/ApiClientTest.js

@@ -0,0 +1,393 @@
+if (typeof module === 'object' && module.exports) {
+  var expect = require('expect.js');
+  var SwaggerPetstore = require('../src/index');
+  var sinon = require('sinon');
+}
+
+var apiClient = SwaggerPetstore.ApiClient.instance;
+
+describe('ApiClient', function() {
+  describe('defaults', function() {
+    it('should have correct default values with the default API client', function() {
+      expect(apiClient).to.be.ok();
+      expect(apiClient.basePath).to.be('http://petstore.swagger.io:80/v2');
+      expect(apiClient.authentications).to.eql({
+        petstore_auth: {type: 'oauth2'},
+        http_basic_test: {type: 'basic'},
+        api_key: {type: 'apiKey', 'in': 'header', name: 'api_key'},
+        api_key_query: {type: 'apiKey', 'in': 'query', name: 'api_key_query'},
+      /* comment out the following as these fake security def (testing purpose)
+       * are removed from the spec, we'll add these back after updating the 
+       * petstore server
+       *
+        test_http_basic: {type: 'basic'},
+        test_api_client_id: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'x-test_api_client_id'
+        },
+        test_api_client_secret: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'x-test_api_client_secret'
+        },
+        test_api_key_query: {
+          type: 'apiKey',
+          'in': 'query',
+          name: 'test_api_key_query'
+        },
+        test_api_key_header: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'test_api_key_header'
+        }*/
+      });
+    });
+
+    it('should have correct default values with new API client and can customize it', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      expect(newClient.basePath).to.be('http://petstore.swagger.io:80/v2');
+      expect(newClient.buildUrl('/abc', {})).to.be('http://petstore.swagger.io:80/v2/abc');
+
+      newClient.basePath = 'http://example.com';
+      expect(newClient.basePath).to.be('http://example.com');
+      expect(newClient.buildUrl('/abc', {})).to.be('http://example.com/abc');
+    });
+  });
+
+  describe('#paramToString', function() {
+    it('should return empty string for null and undefined', function() {
+      expect(apiClient.paramToString(null)).to.be('');
+      expect(apiClient.paramToString(undefined)).to.be('');
+    });
+
+    it('should return string', function() {
+      expect(apiClient.paramToString('')).to.be('');
+      expect(apiClient.paramToString('abc')).to.be('abc');
+      expect(apiClient.paramToString(123)).to.be('123');
+    });
+  });
+
+  describe('#buildCollectionParam', function() {
+    var param;
+
+    beforeEach(function() {
+      param = ['aa', 'bb', 123];
+    });
+
+    it('works for csv', function() {
+      expect(apiClient.buildCollectionParam(param, 'csv')).to.be('aa,bb,123');
+    });
+
+    it('works for ssv', function() {
+      expect(apiClient.buildCollectionParam(param, 'ssv')).to.be('aa bb 123');
+    });
+
+    it('works for tsv', function() {
+      expect(apiClient.buildCollectionParam(param, 'tsv')).to.be('aa\tbb\t123');
+    });
+
+    it('works for pipes', function() {
+      expect(apiClient.buildCollectionParam(param, 'pipes')).to.be('aa|bb|123');
+    });
+
+    it('works for multi', function() {
+      expect(apiClient.buildCollectionParam(param, 'multi')).to.eql(['aa', 'bb', '123']);
+    });
+
+    it('fails for invalid collection format', function() {
+      expect(function() { apiClient.buildCollectionParam(param, 'INVALID'); }).to.throwError();
+    });
+  });
+
+  describe('#buildUrl', function() {
+    it('should work without path parameters in the path', function() {
+      expect(apiClient.buildUrl('/abc', {})).to
+        .be('http://petstore.swagger.io:80/v2/abc');
+      expect(apiClient.buildUrl('/abc/def?ok', {id: 123})).to
+        .be('http://petstore.swagger.io:80/v2/abc/def?ok');
+    });
+
+    it('should work with path parameters in the path', function() {
+      expect(apiClient.buildUrl('/{id}', {id: 123})).to
+        .be('http://petstore.swagger.io:80/v2/123');
+      expect(apiClient.buildUrl('/abc/{id}/{name}?ok', {id: 456, name: 'a b'})).to.
+        be('http://petstore.swagger.io:80/v2/abc/456/a%20b?ok');
+    });
+  });
+
+  describe('#isJsonMime', function() {
+    it('should return true for JSON MIME', function() {
+      expect(apiClient.isJsonMime('application/json')).to.be(true);
+      expect(apiClient.isJsonMime('application/json; charset=UTF8')).to.be(true);
+      expect(apiClient.isJsonMime('APPLICATION/JSON')).to.be(true);
+    });
+
+    it('should return false for non-JSON MIME', function() {
+      expect(apiClient.isJsonMime('')).to.be(false);
+      expect(apiClient.isJsonMime('text/plain')).to.be(false);
+      expect(apiClient.isJsonMime('application/xml')).to.be(false);
+      expect(apiClient.isJsonMime('application/jsonp')).to.be(false);
+    });
+  });
+
+  describe('#applyAuthToRequest', function() {
+    var req, newClient;
+
+    beforeEach(function() {
+      req = {
+        auth: function() {},
+        set: function() {},
+        query: function() {}
+      };
+      sinon.stub(req, 'auth');
+      sinon.stub(req, 'set');
+      sinon.stub(req, 'query');
+      newClient = new SwaggerPetstore.ApiClient();
+    });
+
+    describe('basic', function() {
+      var authName = 'testBasicAuth';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'basic'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets auth header with username and password set', function() {
+        auth.username = 'user';
+        auth.password = 'pass';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'dXNlcjpwYXNz' is base64-encoded string of 'user:pass'
+        sinon.assert.calledWithMatch(req.auth, 'user', 'pass');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets header with only username set', function() {
+        auth.username = 'user';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'dXNlcjo=' is base64-encoded string of 'user:'
+        sinon.assert.calledWithMatch(req.auth, 'user', '');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets header with only password set', function() {
+        auth.password = 'pass';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'OnBhc3M=' is base64-encoded string of ':pass'
+        sinon.assert.calledWithMatch(req.auth, '', 'pass');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('does not set header when username and password are not set', function() {
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+    });
+
+    describe('apiKey', function() {
+      var authName = 'testApiKey';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'apiKey', name: 'api_key'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets api key in header', function() {
+        auth.in = 'header';
+        auth.apiKey = 'my-api-key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets api key in query', function() {
+        auth.in = 'query';
+        auth.apiKey = 'my-api-key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+
+      it('sets api key in header with prefix', function() {
+        auth.in = 'header';
+        auth.apiKey = 'my-api-key';
+        auth.apiKeyPrefix = 'Key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'api_key': 'Key my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('works when api key is not set', function() {
+        auth.in = 'query';
+        auth.apiKey = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('oauth2', function() {
+      var authName = 'testOAuth2';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'oauth2'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets access token in header', function() {
+        auth.accessToken = 'my-access-token';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'Authorization': 'Bearer my-access-token'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('works when access token is not set', function() {
+        auth.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('apiKey and oauth2', function() {
+      var apiKeyAuthName = 'testApiKey';
+      var oauth2Name = 'testOAuth2';
+      var authNames = [apiKeyAuthName, oauth2Name];
+      var apiKeyAuth, oauth2;
+
+      beforeEach(function() {
+        newClient.authentications[apiKeyAuthName] = {type: 'apiKey', name: 'api_key', 'in': 'query'};
+        newClient.authentications[oauth2Name] = {type: 'oauth2'};
+        apiKeyAuth = newClient.authentications[apiKeyAuthName];
+        oauth2 = newClient.authentications[oauth2Name];
+      });
+
+      it('works when setting both api key and access token', function() {
+        apiKeyAuth.apiKey = 'my-api-key';
+        oauth2.accessToken = 'my-access-token';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'Authorization': 'Bearer my-access-token'});
+        sinon.assert.notCalled(req.auth);
+      });
+
+      it('works when setting only api key', function() {
+        apiKeyAuth.apiKey = 'my-api-key';
+        oauth2.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.auth);
+      });
+
+      it('works when neither api key nor access token is set', function() {
+        apiKeyAuth.apiKey = null;
+        oauth2.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('unknown type', function() {
+      var authName = 'unknown';
+      var authNames = [authName];
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'UNKNOWN'};
+      });
+
+      it('throws error for unknown auth type', function() {
+        expect(function() {
+          newClient.applyAuthToRequest(req, authNames);
+        }).to.throwError();
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+    });
+  });
+
+  /*
+  describe('#defaultHeaders', function() {
+    it('should initialize default headers to be an empty object', function() {
+      expect(apiClient.defaultHeaders).to.eql({});
+    });
+
+    it('should put default headers in request', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      newClient.defaultHeaders['Content-Type'] = 'text/plain'
+      newClient.defaultHeaders['api_key'] = 'special-key'
+
+      var expected = {'Content-Type': 'text/plain', 'api_key': 'special-key'};
+      expect(newClient.defaultHeaders).to.eql(expected);
+      var req = makeDumbRequest(newClient);
+      req.unset('User-Agent');
+      expect(req.header).to.eql(expected);
+    });
+
+    it('should override default headers with provided header params', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      newClient.defaultHeaders['Content-Type'] = 'text/plain'
+      newClient.defaultHeaders['api_key'] = 'special-key'
+
+      var headerParams = {'Content-Type': 'application/json', 'Authorization': 'Bearer test-token'}
+      var expected = {
+        'Content-Type': 'application/json',
+        'api_key': 'special-key',
+        'Authorization': 'Bearer test-token'
+      };
+      var req = makeDumbRequest(newClient, {headerParams: headerParams});
+      req.unset('User-Agent');
+      expect(req.header).to.eql(expected);
+    });
+  });
+*/
+
+});
+
+function makeDumbRequest(apiClient, opts) {
+  opts = opts || {};
+  var path = opts.path || '/store/inventory';
+  var httpMethod = opts.httpMethod || 'GET';
+  var pathParams = opts.pathParams || {};
+  var queryParams = opts.queryParams || {};
+  var headerParams = opts.headerParams || {};
+  var formParams = opts.formParams || {};
+  var bodyParam = opts.bodyParam;
+  var authNames = [];
+  var contentTypes = opts.contentTypes || [];
+  var accepts = opts.accepts || [];
+  var callback = opts.callback;
+  return apiClient.callApi(path, httpMethod, pathParams, queryParams,
+    headerParams, formParams, bodyParam, authNames, contentTypes, accepts);
+}

samples/client/petstore/javascript-es6/src/test/api/AnotherFakeApi.spec.js

@@ -0,0 +1,63 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.AnotherFakeApi();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('AnotherFakeApi', function() {
+    describe('testSpecialTags', function() {
+      it('should call testSpecialTags successfully', function(done) {
+        //uncomment below and update the code to test testSpecialTags
+        //instance.testSpecialTags(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/api/FakeApi.spec.js

@@ -0,0 +1,123 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.FakeApi();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('FakeApi', function() {
+    describe('fakeOuterBooleanSerialize', function() {
+      it('should call fakeOuterBooleanSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterBooleanSerialize
+        //instance.fakeOuterBooleanSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterCompositeSerialize', function() {
+      it('should call fakeOuterCompositeSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterCompositeSerialize
+        //instance.fakeOuterCompositeSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterNumberSerialize', function() {
+      it('should call fakeOuterNumberSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterNumberSerialize
+        //instance.fakeOuterNumberSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('fakeOuterStringSerialize', function() {
+      it('should call fakeOuterStringSerialize successfully', function(done) {
+        //uncomment below and update the code to test fakeOuterStringSerialize
+        //instance.fakeOuterStringSerialize(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testClientModel', function() {
+      it('should call testClientModel successfully', function(done) {
+        //uncomment below and update the code to test testClientModel
+        //instance.testClientModel(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testEndpointParameters', function() {
+      it('should call testEndpointParameters successfully', function(done) {
+        //uncomment below and update the code to test testEndpointParameters
+        //instance.testEndpointParameters(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testEnumParameters', function() {
+      it('should call testEnumParameters successfully', function(done) {
+        //uncomment below and update the code to test testEnumParameters
+        //instance.testEnumParameters(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/api/FakeClassnameTags123Api.spec.js

@@ -0,0 +1,63 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.FakeClassnameTags123Api();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('FakeClassnameTags123Api', function() {
+    describe('testClassname', function() {
+      it('should call testClassname successfully', function(done) {
+        //uncomment below and update the code to test testClassname
+        //instance.testClassname(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/api/PetApi.spec.js

@@ -0,0 +1,133 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.PetApi();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('PetApi', function() {
+    describe('addPet', function() {
+      it('should call addPet successfully', function(done) {
+        //uncomment below and update the code to test addPet
+        //instance.addPet(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('deletePet', function() {
+      it('should call deletePet successfully', function(done) {
+        //uncomment below and update the code to test deletePet
+        //instance.deletePet(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('findPetsByStatus', function() {
+      it('should call findPetsByStatus successfully', function(done) {
+        //uncomment below and update the code to test findPetsByStatus
+        //instance.findPetsByStatus(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('findPetsByTags', function() {
+      it('should call findPetsByTags successfully', function(done) {
+        //uncomment below and update the code to test findPetsByTags
+        //instance.findPetsByTags(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('getPetById', function() {
+      it('should call getPetById successfully', function(done) {
+        //uncomment below and update the code to test getPetById
+        //instance.getPetById(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('updatePet', function() {
+      it('should call updatePet successfully', function(done) {
+        //uncomment below and update the code to test updatePet
+        //instance.updatePet(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('updatePetWithForm', function() {
+      it('should call updatePetWithForm successfully', function(done) {
+        //uncomment below and update the code to test updatePetWithForm
+        //instance.updatePetWithForm(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('uploadFile', function() {
+      it('should call uploadFile successfully', function(done) {
+        //uncomment below and update the code to test uploadFile
+        //instance.uploadFile(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/api/StoreApi.spec.js

@@ -0,0 +1,93 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.StoreApi();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('StoreApi', function() {
+    describe('deleteOrder', function() {
+      it('should call deleteOrder successfully', function(done) {
+        //uncomment below and update the code to test deleteOrder
+        //instance.deleteOrder(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('getInventory', function() {
+      it('should call getInventory successfully', function(done) {
+        //uncomment below and update the code to test getInventory
+        //instance.getInventory(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('getOrderById', function() {
+      it('should call getOrderById successfully', function(done) {
+        //uncomment below and update the code to test getOrderById
+        //instance.getOrderById(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('placeOrder', function() {
+      it('should call placeOrder successfully', function(done) {
+        //uncomment below and update the code to test placeOrder
+        //instance.placeOrder(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/api/UserApi.spec.js

@@ -0,0 +1,133 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.UserApi();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('UserApi', function() {
+    describe('createUser', function() {
+      it('should call createUser successfully', function(done) {
+        //uncomment below and update the code to test createUser
+        //instance.createUser(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('createUsersWithArrayInput', function() {
+      it('should call createUsersWithArrayInput successfully', function(done) {
+        //uncomment below and update the code to test createUsersWithArrayInput
+        //instance.createUsersWithArrayInput(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('createUsersWithListInput', function() {
+      it('should call createUsersWithListInput successfully', function(done) {
+        //uncomment below and update the code to test createUsersWithListInput
+        //instance.createUsersWithListInput(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('deleteUser', function() {
+      it('should call deleteUser successfully', function(done) {
+        //uncomment below and update the code to test deleteUser
+        //instance.deleteUser(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('getUserByName', function() {
+      it('should call getUserByName successfully', function(done) {
+        //uncomment below and update the code to test getUserByName
+        //instance.getUserByName(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('loginUser', function() {
+      it('should call loginUser successfully', function(done) {
+        //uncomment below and update the code to test loginUser
+        //instance.loginUser(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('logoutUser', function() {
+      it('should call logoutUser successfully', function(done) {
+        //uncomment below and update the code to test logoutUser
+        //instance.logoutUser(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('updateUser', function() {
+      it('should call updateUser successfully', function(done) {
+        //uncomment below and update the code to test updateUser
+        //instance.updateUser(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/AdditionalPropertiesClass.spec.js

@@ -0,0 +1,71 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.AdditionalPropertiesClass();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('AdditionalPropertiesClass', function() {
+    it('should create an instance of AdditionalPropertiesClass', function() {
+      // uncomment below and update the code to test AdditionalPropertiesClass
+      //var instane = new SwaggerPetstore.AdditionalPropertiesClass();
+      //expect(instance).to.be.a(SwaggerPetstore.AdditionalPropertiesClass);
+    });
+
+    it('should have the property mapProperty (base name: "map_property")', function() {
+      // uncomment below and update the code to test the property mapProperty
+      //var instane = new SwaggerPetstore.AdditionalPropertiesClass();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property mapOfMapProperty (base name: "map_of_map_property")', function() {
+      // uncomment below and update the code to test the property mapOfMapProperty
+      //var instane = new SwaggerPetstore.AdditionalPropertiesClass();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Animal.spec.js

@@ -0,0 +1,71 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Animal();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Animal', function() {
+    it('should create an instance of Animal', function() {
+      // uncomment below and update the code to test Animal
+      //var instane = new SwaggerPetstore.Animal();
+      //expect(instance).to.be.a(SwaggerPetstore.Animal);
+    });
+
+    it('should have the property className (base name: "className")', function() {
+      // uncomment below and update the code to test the property className
+      //var instane = new SwaggerPetstore.Animal();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property color (base name: "color")', function() {
+      // uncomment below and update the code to test the property color
+      //var instane = new SwaggerPetstore.Animal();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/AnimalFarm.spec.js

@@ -0,0 +1,59 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.AnimalFarm();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('AnimalFarm', function() {
+    it('should create an instance of AnimalFarm', function() {
+      // uncomment below and update the code to test AnimalFarm
+      //var instane = new SwaggerPetstore.AnimalFarm();
+      //expect(instance).to.be.a(SwaggerPetstore.AnimalFarm);
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/ApiResponse.spec.js

@@ -0,0 +1,77 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.ApiResponse();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('ApiResponse', function() {
+    it('should create an instance of ApiResponse', function() {
+      // uncomment below and update the code to test ApiResponse
+      //var instane = new SwaggerPetstore.ApiResponse();
+      //expect(instance).to.be.a(SwaggerPetstore.ApiResponse);
+    });
+
+    it('should have the property code (base name: "code")', function() {
+      // uncomment below and update the code to test the property code
+      //var instane = new SwaggerPetstore.ApiResponse();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property type (base name: "type")', function() {
+      // uncomment below and update the code to test the property type
+      //var instane = new SwaggerPetstore.ApiResponse();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property message (base name: "message")', function() {
+      // uncomment below and update the code to test the property message
+      //var instane = new SwaggerPetstore.ApiResponse();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/ArrayOfArrayOfNumberOnly.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.ArrayOfArrayOfNumberOnly();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('ArrayOfArrayOfNumberOnly', function() {
+    it('should create an instance of ArrayOfArrayOfNumberOnly', function() {
+      // uncomment below and update the code to test ArrayOfArrayOfNumberOnly
+      //var instane = new SwaggerPetstore.ArrayOfArrayOfNumberOnly();
+      //expect(instance).to.be.a(SwaggerPetstore.ArrayOfArrayOfNumberOnly);
+    });
+
+    it('should have the property arrayArrayNumber (base name: "ArrayArrayNumber")', function() {
+      // uncomment below and update the code to test the property arrayArrayNumber
+      //var instane = new SwaggerPetstore.ArrayOfArrayOfNumberOnly();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/ArrayOfNumberOnly.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.ArrayOfNumberOnly();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('ArrayOfNumberOnly', function() {
+    it('should create an instance of ArrayOfNumberOnly', function() {
+      // uncomment below and update the code to test ArrayOfNumberOnly
+      //var instane = new SwaggerPetstore.ArrayOfNumberOnly();
+      //expect(instance).to.be.a(SwaggerPetstore.ArrayOfNumberOnly);
+    });
+
+    it('should have the property arrayNumber (base name: "ArrayNumber")', function() {
+      // uncomment below and update the code to test the property arrayNumber
+      //var instane = new SwaggerPetstore.ArrayOfNumberOnly();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/ArrayTest.spec.js

@@ -0,0 +1,77 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.ArrayTest();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('ArrayTest', function() {
+    it('should create an instance of ArrayTest', function() {
+      // uncomment below and update the code to test ArrayTest
+      //var instane = new SwaggerPetstore.ArrayTest();
+      //expect(instance).to.be.a(SwaggerPetstore.ArrayTest);
+    });
+
+    it('should have the property arrayOfString (base name: "array_of_string")', function() {
+      // uncomment below and update the code to test the property arrayOfString
+      //var instane = new SwaggerPetstore.ArrayTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property arrayArrayOfInteger (base name: "array_array_of_integer")', function() {
+      // uncomment below and update the code to test the property arrayArrayOfInteger
+      //var instane = new SwaggerPetstore.ArrayTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property arrayArrayOfModel (base name: "array_array_of_model")', function() {
+      // uncomment below and update the code to test the property arrayArrayOfModel
+      //var instane = new SwaggerPetstore.ArrayTest();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Capitalization.spec.js

@@ -0,0 +1,95 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Capitalization();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Capitalization', function() {
+    it('should create an instance of Capitalization', function() {
+      // uncomment below and update the code to test Capitalization
+      //var instane = new SwaggerPetstore.Capitalization();
+      //expect(instance).to.be.a(SwaggerPetstore.Capitalization);
+    });
+
+    it('should have the property smallCamel (base name: "smallCamel")', function() {
+      // uncomment below and update the code to test the property smallCamel
+      //var instane = new SwaggerPetstore.Capitalization();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property capitalCamel (base name: "CapitalCamel")', function() {
+      // uncomment below and update the code to test the property capitalCamel
+      //var instane = new SwaggerPetstore.Capitalization();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property smallSnake (base name: "small_Snake")', function() {
+      // uncomment below and update the code to test the property smallSnake
+      //var instane = new SwaggerPetstore.Capitalization();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property capitalSnake (base name: "Capital_Snake")', function() {
+      // uncomment below and update the code to test the property capitalSnake
+      //var instane = new SwaggerPetstore.Capitalization();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property sCAETHFlowPoints (base name: "SCA_ETH_Flow_Points")', function() {
+      // uncomment below and update the code to test the property sCAETHFlowPoints
+      //var instane = new SwaggerPetstore.Capitalization();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property ATT_NAME (base name: "ATT_NAME")', function() {
+      // uncomment below and update the code to test the property ATT_NAME
+      //var instane = new SwaggerPetstore.Capitalization();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Cat.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Cat();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Cat', function() {
+    it('should create an instance of Cat', function() {
+      // uncomment below and update the code to test Cat
+      //var instane = new SwaggerPetstore.Cat();
+      //expect(instance).to.be.a(SwaggerPetstore.Cat);
+    });
+
+    it('should have the property declawed (base name: "declawed")', function() {
+      // uncomment below and update the code to test the property declawed
+      //var instane = new SwaggerPetstore.Cat();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Category.spec.js

@@ -0,0 +1,71 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Category();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Category', function() {
+    it('should create an instance of Category', function() {
+      // uncomment below and update the code to test Category
+      //var instane = new SwaggerPetstore.Category();
+      //expect(instance).to.be.a(SwaggerPetstore.Category);
+    });
+
+    it('should have the property id (base name: "id")', function() {
+      // uncomment below and update the code to test the property id
+      //var instane = new SwaggerPetstore.Category();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property name (base name: "name")', function() {
+      // uncomment below and update the code to test the property name
+      //var instane = new SwaggerPetstore.Category();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/ClassModel.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.ClassModel();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('ClassModel', function() {
+    it('should create an instance of ClassModel', function() {
+      // uncomment below and update the code to test ClassModel
+      //var instane = new SwaggerPetstore.ClassModel();
+      //expect(instance).to.be.a(SwaggerPetstore.ClassModel);
+    });
+
+    it('should have the property _class (base name: "_class")', function() {
+      // uncomment below and update the code to test the property _class
+      //var instane = new SwaggerPetstore.ClassModel();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Client.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Client();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Client', function() {
+    it('should create an instance of Client', function() {
+      // uncomment below and update the code to test Client
+      //var instane = new SwaggerPetstore.Client();
+      //expect(instance).to.be.a(SwaggerPetstore.Client);
+    });
+
+    it('should have the property client (base name: "client")', function() {
+      // uncomment below and update the code to test the property client
+      //var instane = new SwaggerPetstore.Client();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Dog.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Dog();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Dog', function() {
+    it('should create an instance of Dog', function() {
+      // uncomment below and update the code to test Dog
+      //var instane = new SwaggerPetstore.Dog();
+      //expect(instance).to.be.a(SwaggerPetstore.Dog);
+    });
+
+    it('should have the property breed (base name: "breed")', function() {
+      // uncomment below and update the code to test the property breed
+      //var instane = new SwaggerPetstore.Dog();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/EnumArrays.spec.js

@@ -0,0 +1,71 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.EnumArrays();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('EnumArrays', function() {
+    it('should create an instance of EnumArrays', function() {
+      // uncomment below and update the code to test EnumArrays
+      //var instane = new SwaggerPetstore.EnumArrays();
+      //expect(instance).to.be.a(SwaggerPetstore.EnumArrays);
+    });
+
+    it('should have the property justSymbol (base name: "just_symbol")', function() {
+      // uncomment below and update the code to test the property justSymbol
+      //var instane = new SwaggerPetstore.EnumArrays();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property arrayEnum (base name: "array_enum")', function() {
+      // uncomment below and update the code to test the property arrayEnum
+      //var instane = new SwaggerPetstore.EnumArrays();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/EnumClass.spec.js

@@ -0,0 +1,58 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('EnumClass', function() {
+    it('should create an instance of EnumClass', function() {
+      // uncomment below and update the code to test EnumClass
+      //var instane = new SwaggerPetstore.EnumClass();
+      //expect(instance).to.be.a(SwaggerPetstore.EnumClass);
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/EnumTest.spec.js

@@ -0,0 +1,83 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.EnumTest();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('EnumTest', function() {
+    it('should create an instance of EnumTest', function() {
+      // uncomment below and update the code to test EnumTest
+      //var instane = new SwaggerPetstore.EnumTest();
+      //expect(instance).to.be.a(SwaggerPetstore.EnumTest);
+    });
+
+    it('should have the property enumString (base name: "enum_string")', function() {
+      // uncomment below and update the code to test the property enumString
+      //var instane = new SwaggerPetstore.EnumTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property enumInteger (base name: "enum_integer")', function() {
+      // uncomment below and update the code to test the property enumInteger
+      //var instane = new SwaggerPetstore.EnumTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property enumNumber (base name: "enum_number")', function() {
+      // uncomment below and update the code to test the property enumNumber
+      //var instane = new SwaggerPetstore.EnumTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property outerEnum (base name: "outerEnum")', function() {
+      // uncomment below and update the code to test the property outerEnum
+      //var instane = new SwaggerPetstore.EnumTest();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/FormatTest.spec.js

@@ -0,0 +1,137 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.FormatTest();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('FormatTest', function() {
+    it('should create an instance of FormatTest', function() {
+      // uncomment below and update the code to test FormatTest
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be.a(SwaggerPetstore.FormatTest);
+    });
+
+    it('should have the property integer (base name: "integer")', function() {
+      // uncomment below and update the code to test the property integer
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property int32 (base name: "int32")', function() {
+      // uncomment below and update the code to test the property int32
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property int64 (base name: "int64")', function() {
+      // uncomment below and update the code to test the property int64
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property _number (base name: "number")', function() {
+      // uncomment below and update the code to test the property _number
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property _float (base name: "float")', function() {
+      // uncomment below and update the code to test the property _float
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property _double (base name: "double")', function() {
+      // uncomment below and update the code to test the property _double
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property _string (base name: "string")', function() {
+      // uncomment below and update the code to test the property _string
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property _byte (base name: "byte")', function() {
+      // uncomment below and update the code to test the property _byte
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property binary (base name: "binary")', function() {
+      // uncomment below and update the code to test the property binary
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property _date (base name: "date")', function() {
+      // uncomment below and update the code to test the property _date
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property dateTime (base name: "dateTime")', function() {
+      // uncomment below and update the code to test the property dateTime
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property uuid (base name: "uuid")', function() {
+      // uncomment below and update the code to test the property uuid
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property password (base name: "password")', function() {
+      // uncomment below and update the code to test the property password
+      //var instane = new SwaggerPetstore.FormatTest();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/HasOnlyReadOnly.spec.js

@@ -0,0 +1,71 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.HasOnlyReadOnly();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('HasOnlyReadOnly', function() {
+    it('should create an instance of HasOnlyReadOnly', function() {
+      // uncomment below and update the code to test HasOnlyReadOnly
+      //var instane = new SwaggerPetstore.HasOnlyReadOnly();
+      //expect(instance).to.be.a(SwaggerPetstore.HasOnlyReadOnly);
+    });
+
+    it('should have the property bar (base name: "bar")', function() {
+      // uncomment below and update the code to test the property bar
+      //var instane = new SwaggerPetstore.HasOnlyReadOnly();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property foo (base name: "foo")', function() {
+      // uncomment below and update the code to test the property foo
+      //var instane = new SwaggerPetstore.HasOnlyReadOnly();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/List.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.List();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('List', function() {
+    it('should create an instance of List', function() {
+      // uncomment below and update the code to test List
+      //var instane = new SwaggerPetstore.List();
+      //expect(instance).to.be.a(SwaggerPetstore.List);
+    });
+
+    it('should have the property _123List (base name: "123-list")', function() {
+      // uncomment below and update the code to test the property _123List
+      //var instane = new SwaggerPetstore.List();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/MapTest.spec.js

@@ -0,0 +1,71 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.MapTest();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('MapTest', function() {
+    it('should create an instance of MapTest', function() {
+      // uncomment below and update the code to test MapTest
+      //var instane = new SwaggerPetstore.MapTest();
+      //expect(instance).to.be.a(SwaggerPetstore.MapTest);
+    });
+
+    it('should have the property mapMapOfString (base name: "map_map_of_string")', function() {
+      // uncomment below and update the code to test the property mapMapOfString
+      //var instane = new SwaggerPetstore.MapTest();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property mapOfEnumString (base name: "map_of_enum_string")', function() {
+      // uncomment below and update the code to test the property mapOfEnumString
+      //var instane = new SwaggerPetstore.MapTest();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/MixedPropertiesAndAdditionalPropertiesClass.spec.js

@@ -0,0 +1,77 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('MixedPropertiesAndAdditionalPropertiesClass', function() {
+    it('should create an instance of MixedPropertiesAndAdditionalPropertiesClass', function() {
+      // uncomment below and update the code to test MixedPropertiesAndAdditionalPropertiesClass
+      //var instane = new SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass();
+      //expect(instance).to.be.a(SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass);
+    });
+
+    it('should have the property uuid (base name: "uuid")', function() {
+      // uncomment below and update the code to test the property uuid
+      //var instane = new SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property dateTime (base name: "dateTime")', function() {
+      // uncomment below and update the code to test the property dateTime
+      //var instane = new SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property map (base name: "map")', function() {
+      // uncomment below and update the code to test the property map
+      //var instane = new SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Model200Response.spec.js

@@ -0,0 +1,71 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Model200Response();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Model200Response', function() {
+    it('should create an instance of Model200Response', function() {
+      // uncomment below and update the code to test Model200Response
+      //var instane = new SwaggerPetstore.Model200Response();
+      //expect(instance).to.be.a(SwaggerPetstore.Model200Response);
+    });
+
+    it('should have the property name (base name: "name")', function() {
+      // uncomment below and update the code to test the property name
+      //var instane = new SwaggerPetstore.Model200Response();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property _class (base name: "class")', function() {
+      // uncomment below and update the code to test the property _class
+      //var instane = new SwaggerPetstore.Model200Response();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/ModelReturn.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.ModelReturn();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('ModelReturn', function() {
+    it('should create an instance of ModelReturn', function() {
+      // uncomment below and update the code to test ModelReturn
+      //var instane = new SwaggerPetstore.ModelReturn();
+      //expect(instance).to.be.a(SwaggerPetstore.ModelReturn);
+    });
+
+    it('should have the property _return (base name: "return")', function() {
+      // uncomment below and update the code to test the property _return
+      //var instane = new SwaggerPetstore.ModelReturn();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Name.spec.js

@@ -0,0 +1,83 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Name();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Name', function() {
+    it('should create an instance of Name', function() {
+      // uncomment below and update the code to test Name
+      //var instane = new SwaggerPetstore.Name();
+      //expect(instance).to.be.a(SwaggerPetstore.Name);
+    });
+
+    it('should have the property name (base name: "name")', function() {
+      // uncomment below and update the code to test the property name
+      //var instane = new SwaggerPetstore.Name();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property snakeCase (base name: "snake_case")', function() {
+      // uncomment below and update the code to test the property snakeCase
+      //var instane = new SwaggerPetstore.Name();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property property (base name: "property")', function() {
+      // uncomment below and update the code to test the property property
+      //var instane = new SwaggerPetstore.Name();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property _123Number (base name: "123Number")', function() {
+      // uncomment below and update the code to test the property _123Number
+      //var instane = new SwaggerPetstore.Name();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/NumberOnly.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.NumberOnly();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('NumberOnly', function() {
+    it('should create an instance of NumberOnly', function() {
+      // uncomment below and update the code to test NumberOnly
+      //var instane = new SwaggerPetstore.NumberOnly();
+      //expect(instance).to.be.a(SwaggerPetstore.NumberOnly);
+    });
+
+    it('should have the property justNumber (base name: "JustNumber")', function() {
+      // uncomment below and update the code to test the property justNumber
+      //var instane = new SwaggerPetstore.NumberOnly();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Order.spec.js

@@ -0,0 +1,95 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Order();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Order', function() {
+    it('should create an instance of Order', function() {
+      // uncomment below and update the code to test Order
+      //var instane = new SwaggerPetstore.Order();
+      //expect(instance).to.be.a(SwaggerPetstore.Order);
+    });
+
+    it('should have the property id (base name: "id")', function() {
+      // uncomment below and update the code to test the property id
+      //var instane = new SwaggerPetstore.Order();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property petId (base name: "petId")', function() {
+      // uncomment below and update the code to test the property petId
+      //var instane = new SwaggerPetstore.Order();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property quantity (base name: "quantity")', function() {
+      // uncomment below and update the code to test the property quantity
+      //var instane = new SwaggerPetstore.Order();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property shipDate (base name: "shipDate")', function() {
+      // uncomment below and update the code to test the property shipDate
+      //var instane = new SwaggerPetstore.Order();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property status (base name: "status")', function() {
+      // uncomment below and update the code to test the property status
+      //var instane = new SwaggerPetstore.Order();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property complete (base name: "complete")', function() {
+      // uncomment below and update the code to test the property complete
+      //var instane = new SwaggerPetstore.Order();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/OuterBoolean.spec.js

@@ -0,0 +1,60 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    // OuterBoolean is not a member of SwaggerPetstore
+    //instance = new SwaggerPetstore.OuterBoolean();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('OuterBoolean', function() {
+    it('should create an instance of OuterBoolean', function() {
+      // uncomment below and update the code to test OuterBoolean
+      //var instane = new SwaggerPetstore.OuterBoolean();
+      //expect(instance).to.be.a(SwaggerPetstore.OuterBoolean);
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/OuterComposite.spec.js

@@ -0,0 +1,77 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.OuterComposite();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('OuterComposite', function() {
+    it('should create an instance of OuterComposite', function() {
+      // uncomment below and update the code to test OuterComposite
+      //var instane = new SwaggerPetstore.OuterComposite();
+      //expect(instance).to.be.a(SwaggerPetstore.OuterComposite);
+    });
+
+    it('should have the property myNumber (base name: "my_number")', function() {
+      // uncomment below and update the code to test the property myNumber
+      //var instane = new SwaggerPetstore.OuterComposite();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property myString (base name: "my_string")', function() {
+      // uncomment below and update the code to test the property myString
+      //var instane = new SwaggerPetstore.OuterComposite();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property myBoolean (base name: "my_boolean")', function() {
+      // uncomment below and update the code to test the property myBoolean
+      //var instane = new SwaggerPetstore.OuterComposite();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/OuterEnum.spec.js

@@ -0,0 +1,58 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('OuterEnum', function() {
+    it('should create an instance of OuterEnum', function() {
+      // uncomment below and update the code to test OuterEnum
+      //var instane = new SwaggerPetstore.OuterEnum();
+      //expect(instance).to.be.a(SwaggerPetstore.OuterEnum);
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/OuterNumber.spec.js

@@ -0,0 +1,60 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    // OuterNumber is not a member of SwaggerPetstore
+    //instance = new SwaggerPetstore.OuterNumber();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('OuterNumber', function() {
+    it('should create an instance of OuterNumber', function() {
+      // uncomment below and update the code to test OuterNumber
+      //var instane = new SwaggerPetstore.OuterNumber();
+      //expect(instance).to.be.a(SwaggerPetstore.OuterNumber);
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/OuterString.spec.js

@@ -0,0 +1,60 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    // OuterString is not a member of SwaggerPetstore
+    //instance = new SwaggerPetstore.OuterString();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('OuterString', function() {
+    it('should create an instance of OuterString', function() {
+      // uncomment below and update the code to test OuterString
+      //var instane = new SwaggerPetstore.OuterString();
+      //expect(instance).to.be.a(SwaggerPetstore.OuterString);
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Pet.spec.js

@@ -0,0 +1,95 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Pet();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Pet', function() {
+    it('should create an instance of Pet', function() {
+      // uncomment below and update the code to test Pet
+      //var instane = new SwaggerPetstore.Pet();
+      //expect(instance).to.be.a(SwaggerPetstore.Pet);
+    });
+
+    it('should have the property id (base name: "id")', function() {
+      // uncomment below and update the code to test the property id
+      //var instane = new SwaggerPetstore.Pet();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property category (base name: "category")', function() {
+      // uncomment below and update the code to test the property category
+      //var instane = new SwaggerPetstore.Pet();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property name (base name: "name")', function() {
+      // uncomment below and update the code to test the property name
+      //var instane = new SwaggerPetstore.Pet();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property photoUrls (base name: "photoUrls")', function() {
+      // uncomment below and update the code to test the property photoUrls
+      //var instane = new SwaggerPetstore.Pet();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property tags (base name: "tags")', function() {
+      // uncomment below and update the code to test the property tags
+      //var instane = new SwaggerPetstore.Pet();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property status (base name: "status")', function() {
+      // uncomment below and update the code to test the property status
+      //var instane = new SwaggerPetstore.Pet();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/ReadOnlyFirst.spec.js

@@ -0,0 +1,71 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.ReadOnlyFirst();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('ReadOnlyFirst', function() {
+    it('should create an instance of ReadOnlyFirst', function() {
+      // uncomment below and update the code to test ReadOnlyFirst
+      //var instane = new SwaggerPetstore.ReadOnlyFirst();
+      //expect(instance).to.be.a(SwaggerPetstore.ReadOnlyFirst);
+    });
+
+    it('should have the property bar (base name: "bar")', function() {
+      // uncomment below and update the code to test the property bar
+      //var instane = new SwaggerPetstore.ReadOnlyFirst();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property baz (base name: "baz")', function() {
+      // uncomment below and update the code to test the property baz
+      //var instane = new SwaggerPetstore.ReadOnlyFirst();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/SpecialModelName.spec.js

@@ -0,0 +1,65 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.SpecialModelName();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('SpecialModelName', function() {
+    it('should create an instance of SpecialModelName', function() {
+      // uncomment below and update the code to test SpecialModelName
+      //var instane = new SwaggerPetstore.SpecialModelName();
+      //expect(instance).to.be.a(SwaggerPetstore.SpecialModelName);
+    });
+
+    it('should have the property specialPropertyName (base name: "$special[property.name]")', function() {
+      // uncomment below and update the code to test the property specialPropertyName
+      //var instane = new SwaggerPetstore.SpecialModelName();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/Tag.spec.js

@@ -0,0 +1,71 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.Tag();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('Tag', function() {
+    it('should create an instance of Tag', function() {
+      // uncomment below and update the code to test Tag
+      //var instane = new SwaggerPetstore.Tag();
+      //expect(instance).to.be.a(SwaggerPetstore.Tag);
+    });
+
+    it('should have the property id (base name: "id")', function() {
+      // uncomment below and update the code to test the property id
+      //var instane = new SwaggerPetstore.Tag();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property name (base name: "name")', function() {
+      // uncomment below and update the code to test the property name
+      //var instane = new SwaggerPetstore.Tag();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/src/test/model/User.spec.js

@@ -0,0 +1,107 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', '../../src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require('../../src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.SwaggerPetstore);
+  }
+}(this, function(expect, SwaggerPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new SwaggerPetstore.User();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('User', function() {
+    it('should create an instance of User', function() {
+      // uncomment below and update the code to test User
+      //var instane = new SwaggerPetstore.User();
+      //expect(instance).to.be.a(SwaggerPetstore.User);
+    });
+
+    it('should have the property id (base name: "id")', function() {
+      // uncomment below and update the code to test the property id
+      //var instane = new SwaggerPetstore.User();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property username (base name: "username")', function() {
+      // uncomment below and update the code to test the property username
+      //var instane = new SwaggerPetstore.User();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property firstName (base name: "firstName")', function() {
+      // uncomment below and update the code to test the property firstName
+      //var instane = new SwaggerPetstore.User();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property lastName (base name: "lastName")', function() {
+      // uncomment below and update the code to test the property lastName
+      //var instane = new SwaggerPetstore.User();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property email (base name: "email")', function() {
+      // uncomment below and update the code to test the property email
+      //var instane = new SwaggerPetstore.User();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property password (base name: "password")', function() {
+      // uncomment below and update the code to test the property password
+      //var instane = new SwaggerPetstore.User();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property phone (base name: "phone")', function() {
+      // uncomment below and update the code to test the property phone
+      //var instane = new SwaggerPetstore.User();
+      //expect(instance).to.be();
+    });
+
+    it('should have the property userStatus (base name: "userStatus")', function() {
+      // uncomment below and update the code to test the property userStatus
+      //var instane = new SwaggerPetstore.User();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));

samples/client/petstore/javascript-es6/test/ApiClientTest.js

@@ -0,0 +1,393 @@
+if (typeof module === 'object' && module.exports) {
+  var expect = require('expect.js');
+  var SwaggerPetstore = require('../src/index');
+  var sinon = require('sinon');
+}
+
+var apiClient = SwaggerPetstore.ApiClient.instance;
+
+describe('ApiClient', function() {
+  describe('defaults', function() {
+    it('should have correct default values with the default API client', function() {
+      expect(apiClient).to.be.ok();
+      expect(apiClient.basePath).to.be('http://petstore.swagger.io:80/v2');
+      expect(apiClient.authentications).to.eql({
+        petstore_auth: {type: 'oauth2'},
+        http_basic_test: {type: 'basic'},
+        api_key: {type: 'apiKey', 'in': 'header', name: 'api_key'},
+        api_key_query: {type: 'apiKey', 'in': 'query', name: 'api_key_query'},
+      /* comment out the following as these fake security def (testing purpose)
+       * are removed from the spec, we'll add these back after updating the 
+       * petstore server
+       *
+        test_http_basic: {type: 'basic'},
+        test_api_client_id: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'x-test_api_client_id'
+        },
+        test_api_client_secret: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'x-test_api_client_secret'
+        },
+        test_api_key_query: {
+          type: 'apiKey',
+          'in': 'query',
+          name: 'test_api_key_query'
+        },
+        test_api_key_header: {
+          type: 'apiKey',
+          'in': 'header',
+          name: 'test_api_key_header'
+        }*/
+      });
+    });
+
+    it('should have correct default values with new API client and can customize it', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      expect(newClient.basePath).to.be('http://petstore.swagger.io:80/v2');
+      expect(newClient.buildUrl('/abc', {})).to.be('http://petstore.swagger.io:80/v2/abc');
+
+      newClient.basePath = 'http://example.com';
+      expect(newClient.basePath).to.be('http://example.com');
+      expect(newClient.buildUrl('/abc', {})).to.be('http://example.com/abc');
+    });
+  });
+
+  describe('#paramToString', function() {
+    it('should return empty string for null and undefined', function() {
+      expect(apiClient.paramToString(null)).to.be('');
+      expect(apiClient.paramToString(undefined)).to.be('');
+    });
+
+    it('should return string', function() {
+      expect(apiClient.paramToString('')).to.be('');
+      expect(apiClient.paramToString('abc')).to.be('abc');
+      expect(apiClient.paramToString(123)).to.be('123');
+    });
+  });
+
+  describe('#buildCollectionParam', function() {
+    var param;
+
+    beforeEach(function() {
+      param = ['aa', 'bb', 123];
+    });
+
+    it('works for csv', function() {
+      expect(apiClient.buildCollectionParam(param, 'csv')).to.be('aa,bb,123');
+    });
+
+    it('works for ssv', function() {
+      expect(apiClient.buildCollectionParam(param, 'ssv')).to.be('aa bb 123');
+    });
+
+    it('works for tsv', function() {
+      expect(apiClient.buildCollectionParam(param, 'tsv')).to.be('aa\tbb\t123');
+    });
+
+    it('works for pipes', function() {
+      expect(apiClient.buildCollectionParam(param, 'pipes')).to.be('aa|bb|123');
+    });
+
+    it('works for multi', function() {
+      expect(apiClient.buildCollectionParam(param, 'multi')).to.eql(['aa', 'bb', '123']);
+    });
+
+    it('fails for invalid collection format', function() {
+      expect(function() { apiClient.buildCollectionParam(param, 'INVALID'); }).to.throwError();
+    });
+  });
+
+  describe('#buildUrl', function() {
+    it('should work without path parameters in the path', function() {
+      expect(apiClient.buildUrl('/abc', {})).to
+        .be('http://petstore.swagger.io:80/v2/abc');
+      expect(apiClient.buildUrl('/abc/def?ok', {id: 123})).to
+        .be('http://petstore.swagger.io:80/v2/abc/def?ok');
+    });
+
+    it('should work with path parameters in the path', function() {
+      expect(apiClient.buildUrl('/{id}', {id: 123})).to
+        .be('http://petstore.swagger.io:80/v2/123');
+      expect(apiClient.buildUrl('/abc/{id}/{name}?ok', {id: 456, name: 'a b'})).to.
+        be('http://petstore.swagger.io:80/v2/abc/456/a%20b?ok');
+    });
+  });
+
+  describe('#isJsonMime', function() {
+    it('should return true for JSON MIME', function() {
+      expect(apiClient.isJsonMime('application/json')).to.be(true);
+      expect(apiClient.isJsonMime('application/json; charset=UTF8')).to.be(true);
+      expect(apiClient.isJsonMime('APPLICATION/JSON')).to.be(true);
+    });
+
+    it('should return false for non-JSON MIME', function() {
+      expect(apiClient.isJsonMime('')).to.be(false);
+      expect(apiClient.isJsonMime('text/plain')).to.be(false);
+      expect(apiClient.isJsonMime('application/xml')).to.be(false);
+      expect(apiClient.isJsonMime('application/jsonp')).to.be(false);
+    });
+  });
+
+  describe('#applyAuthToRequest', function() {
+    var req, newClient;
+
+    beforeEach(function() {
+      req = {
+        auth: function() {},
+        set: function() {},
+        query: function() {}
+      };
+      sinon.stub(req, 'auth');
+      sinon.stub(req, 'set');
+      sinon.stub(req, 'query');
+      newClient = new SwaggerPetstore.ApiClient();
+    });
+
+    describe('basic', function() {
+      var authName = 'testBasicAuth';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'basic'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets auth header with username and password set', function() {
+        auth.username = 'user';
+        auth.password = 'pass';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'dXNlcjpwYXNz' is base64-encoded string of 'user:pass'
+        sinon.assert.calledWithMatch(req.auth, 'user', 'pass');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets header with only username set', function() {
+        auth.username = 'user';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'dXNlcjo=' is base64-encoded string of 'user:'
+        sinon.assert.calledWithMatch(req.auth, 'user', '');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets header with only password set', function() {
+        auth.password = 'pass';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.auth);
+        // 'OnBhc3M=' is base64-encoded string of ':pass'
+        sinon.assert.calledWithMatch(req.auth, '', 'pass');
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('does not set header when username and password are not set', function() {
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.query);
+      });
+    });
+
+    describe('apiKey', function() {
+      var authName = 'testApiKey';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'apiKey', name: 'api_key'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets api key in header', function() {
+        auth.in = 'header';
+        auth.apiKey = 'my-api-key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('sets api key in query', function() {
+        auth.in = 'query';
+        auth.apiKey = 'my-api-key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+
+      it('sets api key in header with prefix', function() {
+        auth.in = 'header';
+        auth.apiKey = 'my-api-key';
+        auth.apiKeyPrefix = 'Key';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'api_key': 'Key my-api-key'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('works when api key is not set', function() {
+        auth.in = 'query';
+        auth.apiKey = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('oauth2', function() {
+      var authName = 'testOAuth2';
+      var authNames = [authName];
+      var auth;
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'oauth2'};
+        auth = newClient.authentications[authName];
+      });
+
+      it('sets access token in header', function() {
+        auth.accessToken = 'my-access-token';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'Authorization': 'Bearer my-access-token'});
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+
+      it('works when access token is not set', function() {
+        auth.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('apiKey and oauth2', function() {
+      var apiKeyAuthName = 'testApiKey';
+      var oauth2Name = 'testOAuth2';
+      var authNames = [apiKeyAuthName, oauth2Name];
+      var apiKeyAuth, oauth2;
+
+      beforeEach(function() {
+        newClient.authentications[apiKeyAuthName] = {type: 'apiKey', name: 'api_key', 'in': 'query'};
+        newClient.authentications[oauth2Name] = {type: 'oauth2'};
+        apiKeyAuth = newClient.authentications[apiKeyAuthName];
+        oauth2 = newClient.authentications[oauth2Name];
+      });
+
+      it('works when setting both api key and access token', function() {
+        apiKeyAuth.apiKey = 'my-api-key';
+        oauth2.accessToken = 'my-access-token';
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.calledOnce(req.set);
+        sinon.assert.calledWithMatch(req.set, {'Authorization': 'Bearer my-access-token'});
+        sinon.assert.notCalled(req.auth);
+      });
+
+      it('works when setting only api key', function() {
+        apiKeyAuth.apiKey = 'my-api-key';
+        oauth2.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.calledOnce(req.query);
+        sinon.assert.calledWithMatch(req.query, {'api_key': 'my-api-key'});
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.auth);
+      });
+
+      it('works when neither api key nor access token is set', function() {
+        apiKeyAuth.apiKey = null;
+        oauth2.accessToken = null;
+        newClient.applyAuthToRequest(req, authNames);
+        sinon.assert.notCalled(req.query);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.set);
+      });
+    });
+
+    describe('unknown type', function() {
+      var authName = 'unknown';
+      var authNames = [authName];
+
+      beforeEach(function() {
+        newClient.authentications[authName] = {type: 'UNKNOWN'};
+      });
+
+      it('throws error for unknown auth type', function() {
+        expect(function() {
+          newClient.applyAuthToRequest(req, authNames);
+        }).to.throwError();
+        sinon.assert.notCalled(req.set);
+        sinon.assert.notCalled(req.auth);
+        sinon.assert.notCalled(req.query);
+      });
+    });
+  });
+
+  /*
+  describe('#defaultHeaders', function() {
+    it('should initialize default headers to be an empty object', function() {
+      expect(apiClient.defaultHeaders).to.eql({});
+    });
+
+    it('should put default headers in request', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      newClient.defaultHeaders['Content-Type'] = 'text/plain'
+      newClient.defaultHeaders['api_key'] = 'special-key'
+
+      var expected = {'Content-Type': 'text/plain', 'api_key': 'special-key'};
+      expect(newClient.defaultHeaders).to.eql(expected);
+      var req = makeDumbRequest(newClient);
+      req.unset('User-Agent');
+      expect(req.header).to.eql(expected);
+    });
+
+    it('should override default headers with provided header params', function() {
+      var newClient = new SwaggerPetstore.ApiClient;
+      newClient.defaultHeaders['Content-Type'] = 'text/plain'
+      newClient.defaultHeaders['api_key'] = 'special-key'
+
+      var headerParams = {'Content-Type': 'application/json', 'Authorization': 'Bearer test-token'}
+      var expected = {
+        'Content-Type': 'application/json',
+        'api_key': 'special-key',
+        'Authorization': 'Bearer test-token'
+      };
+      var req = makeDumbRequest(newClient, {headerParams: headerParams});
+      req.unset('User-Agent');
+      expect(req.header).to.eql(expected);
+    });
+  });
+*/
+
+});
+
+function makeDumbRequest(apiClient, opts) {
+  opts = opts || {};
+  var path = opts.path || '/store/inventory';
+  var httpMethod = opts.httpMethod || 'GET';
+  var pathParams = opts.pathParams || {};
+  var queryParams = opts.queryParams || {};
+  var headerParams = opts.headerParams || {};
+  var formParams = opts.formParams || {};
+  var bodyParam = opts.bodyParam;
+  var authNames = [];
+  var contentTypes = opts.contentTypes || [];
+  var accepts = opts.accepts || [];
+  var callback = opts.callback;
+  return apiClient.callApi(path, httpMethod, pathParams, queryParams,
+    headerParams, formParams, bodyParam, authNames, contentTypes, accepts);
+}

samples/client/petstore/javascript-es6/test/api/AnotherFakeApi.spec.js

@@ -1,12 +1,12 @@
 /**
- * Swagger Petstore
+ * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
  * 
- * NOTE: This class is auto generated by the swagger code generator program.
+ *
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  *
  */
@@ -20,15 +20,15 @@
     factory(require('expect.js'), require('../../src/index'));
   } else {
     // Browser globals (root is window)
-    factory(root.expect, root.SwaggerPetstore);
+    factory(root.expect, root.OpenApiPetstore);
   }
-}(this, function(expect, SwaggerPetstore) {
+}(this, function(expect, OpenApiPetstore) {
   'use strict';
 
   var instance;
 
   beforeEach(function() {
-    instance = new SwaggerPetstore.AnotherFakeApi();
+    instance = new OpenApiPetstore.AnotherFakeApi();
   });
 
   var getProperty = function(object, getter, property) {

samples/client/petstore/javascript-es6/test/api/FakeApi.spec.js

@@ -1,12 +1,12 @@
 /**
- * Swagger Petstore
+ * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
  * 
- * NOTE: This class is auto generated by the swagger code generator program.
+ *
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  *
  */
@@ -20,15 +20,15 @@
     factory(require('expect.js'), require('../../src/index'));
   } else {
     // Browser globals (root is window)
-    factory(root.expect, root.SwaggerPetstore);
+    factory(root.expect, root.OpenApiPetstore);
   }
-}(this, function(expect, SwaggerPetstore) {
+}(this, function(expect, OpenApiPetstore) {
   'use strict';
 
   var instance;
 
   beforeEach(function() {
-    instance = new SwaggerPetstore.FakeApi();
+    instance = new OpenApiPetstore.FakeApi();
   });
 
   var getProperty = function(object, getter, property) {
@@ -88,6 +88,16 @@
         done();
       });
     });
+    describe('testBodyWithQueryParams', function() {
+      it('should call testBodyWithQueryParams successfully', function(done) {
+        //uncomment below and update the code to test testBodyWithQueryParams
+        //instance.testBodyWithQueryParams(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
     describe('testClientModel', function() {
       it('should call testClientModel successfully', function(done) {
         //uncomment below and update the code to test testClientModel
@@ -118,6 +128,26 @@
         done();
       });
     });
+    describe('testInlineAdditionalProperties', function() {
+      it('should call testInlineAdditionalProperties successfully', function(done) {
+        //uncomment below and update the code to test testInlineAdditionalProperties
+        //instance.testInlineAdditionalProperties(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
+    describe('testJsonFormData', function() {
+      it('should call testJsonFormData successfully', function(done) {
+        //uncomment below and update the code to test testJsonFormData
+        //instance.testJsonFormData(function(error) {
+        //  if (error) throw error;
+        //expect().to.be();
+        //});
+        done();
+      });
+    });
   });
 
 }));

samples/client/petstore/javascript-es6/test/api/FakeClassnameTags123Api.spec.js

@@ -1,12 +1,12 @@
 /**
- * Swagger Petstore
+ * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
  * 
- * NOTE: This class is auto generated by the swagger code generator program.
+ *
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  *
  */
@@ -20,15 +20,15 @@
     factory(require('expect.js'), require('../../src/index'));
   } else {
     // Browser globals (root is window)
-    factory(root.expect, root.SwaggerPetstore);
+    factory(root.expect, root.OpenApiPetstore);
   }
-}(this, function(expect, SwaggerPetstore) {
+}(this, function(expect, OpenApiPetstore) {
   'use strict';
 
   var instance;
 
   beforeEach(function() {
-    instance = new SwaggerPetstore.FakeClassnameTags123Api();
+    instance = new OpenApiPetstore.FakeClassnameTags123Api();
   });
 
   var getProperty = function(object, getter, property) {

samples/client/petstore/javascript-es6/test/api/PetApi.spec.js

@@ -1,12 +1,12 @@
 /**
- * Swagger Petstore
+ * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
  * 
- * NOTE: This class is auto generated by the swagger code generator program.
+ *
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  *
  */
@@ -20,15 +20,15 @@
     factory(require('expect.js'), require('../../src/index'));
   } else {
     // Browser globals (root is window)
-    factory(root.expect, root.SwaggerPetstore);
+    factory(root.expect, root.OpenApiPetstore);
   }
-}(this, function(expect, SwaggerPetstore) {
+}(this, function(expect, OpenApiPetstore) {
   'use strict';
 
   var instance;
 
   beforeEach(function() {
-    instance = new SwaggerPetstore.PetApi();
+    instance = new OpenApiPetstore.PetApi();
   });
 
   var getProperty = function(object, getter, property) {

samples/client/petstore/javascript-es6/test/api/StoreApi.spec.js

@@ -1,12 +1,12 @@
 /**
- * Swagger Petstore
+ * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
  * 
- * NOTE: This class is auto generated by the swagger code generator program.
+ *
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  *
  */
@@ -20,15 +20,15 @@
     factory(require('expect.js'), require('../../src/index'));
   } else {
     // Browser globals (root is window)
-    factory(root.expect, root.SwaggerPetstore);
+    factory(root.expect, root.OpenApiPetstore);
   }
-}(this, function(expect, SwaggerPetstore) {
+}(this, function(expect, OpenApiPetstore) {
   'use strict';
 
   var instance;
 
   beforeEach(function() {
-    instance = new SwaggerPetstore.StoreApi();
+    instance = new OpenApiPetstore.StoreApi();
   });
 
   var getProperty = function(object, getter, property) {