Merge pull request #6 from hadiindrawan/dev

change schema file

Author: hadiindrawan

lib/component/json_schema.js

@@ -10,11 +10,11 @@ async function writeJsonSchema(element, jsonSchemaPath) {
     // A variable called 'method' is created and assigned the value obtained from the 'method' property of the 'element.request' object.
     let method = element.request.method;
     // check if file exists
-    isFileExisted(jsonSchemaPath, method + '_' + name + '.json')
+    isFileExisted(jsonSchemaPath, method + '_' + name + '.schema.js')
         .then((data) => {
             if (!data[0]) {
                 // create file test
-                fs.writeFile(jsonSchemaPath + '/' + method + '_' +name + '.json',
+                fs.writeFile(jsonSchemaPath + '/' + method + '_' +name + '.schema.js',
                     fs.readFileSync(basePath() + 'lib/template/json_responses.dot', 'utf8'), function (err) { if (err) throw err; });
             }
         })

lib/component/pages.js

@@ -133,7 +133,7 @@ async function writePages(element, path, jsonSchemaRelativePath, helperPath, mai
     }
 
     code = code.replace("{{objectBody}}", bodyRaw)
-    code = code.replace("{{jsonSchemaPath}}", jsonSchemaRelativePath + '/' + method + '_'+ name + '.json')
+    code = code.replace("{{jsonSchemaPath}}", jsonSchemaRelativePath + '/' + method + '_'+ name + '.schema.js')
     code = code.replace("{{bodyFunc}}", bodyFunc)
     code = code.replace("{{rawAtt}}", attKey)
     code = code.replace("{{helperPath}}", helperPath)

lib/template/json_responses.dot

@@ -1,10 +1,18 @@
-{
-    "success":
-    {
-        "example": "" 
-    },
-    "failed":
-    {
-        "example": "" 
+class schema {
+    json() {
+        const json = 
+        {
+            "success":
+            {
+                "example": ""
+            },
+            "failed":
+            {
+                "example": ""
+            }
+        }
+        return json
     }
-}
+}
+
+module.exports = schema

lib/template/request.dot

@@ -1,7 +1,7 @@
 const chai = require('chai')
 chai.use(require('chai-http'))
 const main = require('{{mainpagesPath}}');
-const json_responses = require('{{jsonSchemaPath}}');
+const schema = require('{{jsonSchemaPath}}');
 const requestHelper = require('{{helperPath}}');
 require('dotenv').config()
 
@@ -38,7 +38,7 @@ class request extends main {
 
 	// This method used for provide expectation and return json schema
     expect(cases="success") {
-		return new requestHelper().getSchema(json_responses, cases)
+		return new requestHelper().getSchema(new schema().json(), cases)
     }
 }
 

lib/template/requestWithAttach.dot

@@ -1,7 +1,7 @@
 const chai = require('chai')
 chai.use(require('chai-http'))
 const main = require('{{mainpagesPath}}');
-const json_responses = require('{{jsonSchemaPath}}');
+const schema = require('{{jsonSchemaPath}}');
 const requestHelper = require('{{helperPath}}');
 require('dotenv').config()
 
@@ -68,7 +68,7 @@ class request extends main {
 
 	// This method used for provide expectation and return json schema
 	expect(cases="success") {
-		return new requestHelper().getSchema(json_responses, cases)
+		return new requestHelper().getSchema(new schema().json(), cases)
 	}
 }