Fix JS test using baseName in default value (#5)

* fix js test using baseName in default value * re-enable JS test
OpenAPITools · May 13, 2018 · d80e295 · d80e295
1 parent e33f9e5
commit d80e295
Show file tree

Hide file tree

Showing 46 changed files with 19 additions and 2,005 deletions.
diff --git a/...i-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/...i-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
@@ -617,7 +617,7 @@ public String toDefaultValue(Schema p) {
     public String toDefaultValueWithParam(String name, Schema p) {
         String type = normalizeType(getTypeDeclaration(p));
         if (!StringUtils.isEmpty(p.get$ref())) {
-            return " = " + type + ".constructFromObject(data['" + getSchemaType(p) + "']);";
+            return " = " + type + ".constructFromObject(data['" + name + "']);";
         } else {
             return " = ApiClient.convertToType(data['" + name + "'], " + type + ");";
         }

diff --git a/pom.xml b/pom.xml
@@ -857,7 +857,7 @@
                 <module>samples/openapi3/client/petstore/php/OpenAPIClient-php</module>
                 <module>samples/client/petstore/scala</module>
                 <module>samples/client/petstore/akka-scala</module>
-                <!--<module>samples/client/petstore/javascript</module>-->
+                <module>samples/client/petstore/javascript</module>
                 <module>samples/client/petstore/python</module>
                 <module>samples/client/petstore/python-tornado</module>
                 <module>samples/client/petstore/python-asyncio</module>

diff --git a/samples/client/petstore/javascript/docs/AdditionalPropertiesClass.md b/samples/client/petstore/javascript/docs/AdditionalPropertiesClass.md
diff --git a/samples/client/petstore/javascript/docs/Animal.md b/samples/client/petstore/javascript/docs/Animal.md
diff --git a/samples/client/petstore/javascript/docs/AnimalFarm.md b/samples/client/petstore/javascript/docs/AnimalFarm.md
diff --git a/samples/client/petstore/javascript/docs/AnotherFakeApi.md b/samples/client/petstore/javascript/docs/AnotherFakeApi.md
diff --git a/samples/client/petstore/javascript/docs/ApiResponse.md b/samples/client/petstore/javascript/docs/ApiResponse.md
diff --git a/samples/client/petstore/javascript/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/javascript/docs/ArrayOfArrayOfNumberOnly.md
diff --git a/samples/client/petstore/javascript/docs/ArrayOfNumberOnly.md b/samples/client/petstore/javascript/docs/ArrayOfNumberOnly.md
diff --git a/samples/client/petstore/javascript/docs/ArrayTest.md b/samples/client/petstore/javascript/docs/ArrayTest.md
diff --git a/samples/client/petstore/javascript/docs/Capitalization.md b/samples/client/petstore/javascript/docs/Capitalization.md
diff --git a/samples/client/petstore/javascript/docs/Cat.md b/samples/client/petstore/javascript/docs/Cat.md
diff --git a/samples/client/petstore/javascript/docs/Category.md b/samples/client/petstore/javascript/docs/Category.md
diff --git a/samples/client/petstore/javascript/docs/ClassModel.md b/samples/client/petstore/javascript/docs/ClassModel.md
diff --git a/samples/client/petstore/javascript/docs/Client.md b/samples/client/petstore/javascript/docs/Client.md
diff --git a/samples/client/petstore/javascript/docs/Dog.md b/samples/client/petstore/javascript/docs/Dog.md
diff --git a/samples/client/petstore/javascript/docs/EnumArrays.md b/samples/client/petstore/javascript/docs/EnumArrays.md
diff --git a/samples/client/petstore/javascript/docs/EnumClass.md b/samples/client/petstore/javascript/docs/EnumClass.md
diff --git a/samples/client/petstore/javascript/docs/EnumTest.md b/samples/client/petstore/javascript/docs/EnumTest.md