@skyramp/skyramp 0.4.39 → 0.4.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyramp/skyramp",
-  "version": "0.4.39",
+  "version": "0.4.41",
   "description": "module for leveraging skyramp cli functionality",
   "scripts": {
     "pack": "npm pack"

package/src/classes/Endpoint.js

@@ -1,5 +1,5 @@
 const lib = require('../lib');
-const { getYamlBytes, readDataFromFile } = require('../utils');
+const { getYamlBytes, readDataFromFile, SKYRAMP_YAML_VERSION } = require('../utils');
 const writeMockDescriptionWrapper = lib.func('writeMockDescriptionWrapper', 'string', ['string', 'string']);
 
 class Endpoint {
@@ -8,14 +8,14 @@ class Endpoint {
       const endpoint = JSON.parse(endpointData);
       this.services = endpoint.services;
       this.endpoint = endpoint.endpoints[0];
-      for (const method of this.endpoint.methods) {
-        method.proxy = true;
-      }
-      this.responseValues = endpoint.responseValues;
+
+      this.responses = endpoint.responses;
+
       this.mockDescription = {
+        version: SKYRAMP_YAML_VERSION, 
         services: this.services,
         endpoints: [this.endpoint],
-        responseValues: this.responseValues
+        responses: this.responses
       };
     } catch(error) {
       throw new Error(endpointData);
@@ -23,25 +23,36 @@ class Endpoint {
   }
 
   mockMethod(methodName, mockObject, dynamic=false) {
-    for (const method of this.endpoint.methods) {
-      if (method.name === methodName || method.type === methodName) {
-        const responseName = method.responseValue;
-        delete method.proxy;
-        for (const responseValue of this.responseValues) {
-          if (responseValue.name === responseName) {
-            if (dynamic) {
-              responseValue.javascriptPath = mockObject;
-              delete responseValue.blob;
-            } else {
-              responseValue.blob = mockObject.responseValue.blob;
-              delete responseValue.javascriptPath;
-            }
-            return;
-          }
+    if (!this.endpoint.methods.some(method => method.name === methodName)) {
+      throw new Error(`Method ${methodName} not found`);
+    }
+
+    for (const response of this.responses) {
+      if (response.methodName === methodName && response.endpointName === this.endpoint.name) {
+        if (dynamic) {
+          response.javascriptPath = mockObject;
+          delete response.blob;
+        } else {
+          response.blob = mockObject.responseValue.blob;
+          delete response.javascriptPath;
         }
+
+        return;
       }
     }
-    throw new Error(`Method ${methodName} not found`);
+
+    newResponse = {
+      methodName: methodName,
+      endpointName: this.endpoint.name
+    };
+
+    if (dynamic) {
+      newResponse.javascriptPath = mock;
+    } else {
+      newResponse.blob = mockObject.responseValue.blob;
+    }
+
+    this.responses.append(newResponse)
   }
 
   mockMethodFromFile(methodName, fileName) {

package/src/classes/Scenario.js

@@ -15,14 +15,14 @@ class Scenario {
   addRequest(endpoint, methodName, requestObject=undefined, dynamic=false) {
     this.buildRequestsFromEndpoint(endpoint);
     for (const request of this.requests) {
-      if (request.method === methodName) {
+      if (request.methodName === methodName) {
         if (dynamic) {
-          request.requestValue.javascriptPath = requestObject;
-          delete request.requestValue.blob;
+          request.javascriptPath = requestObject;
+          delete request.blob;
         } else if (requestObject !== undefined) {
-          request.requestValue = requestObject.requestValue;
+          request.blob = requestObject.requestValue.blob;
         }
-        this.steps.push({ request: request.name });
+        this.steps.push({ requestName: request.name });
         return request.name;
       }
     }
@@ -38,12 +38,10 @@ class Scenario {
     if (this.endpoints.indexOf(endpoint.endpoint) !== -1) {
       return;
     }
-    const processedMethods = endpoint.endpoint.methods.map(method => {
-      const { responseValue, proxy, ...rest } = method;
-      return rest;
-    });
+    
     this.services.push(...endpoint.services);
-    this.endpoints.push({ ...endpoint.endpoint, methods: processedMethods });
+    this.endpoints.push(endpoint.endpoint);
+
     const yamlContent = getYamlBytes(endpoint.mockDescription);
     const response = buildRequestsWrapper(yamlContent);
     try {

package/src/utils.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const yaml = require('js-yaml');
+const SKYRAMP_YAML_VERSION = "v1"
 
 function getYamlBytes(jsonObject) {
   try {
@@ -13,11 +14,11 @@ function getYamlBytes(jsonObject) {
 
 function createTestDescriptionFromScenario(scenario) {
   return {
+    version: SKYRAMP_YAML_VERSION,
     test: {
-      name: scenario.name,
       testPattern: [{
           startAt: 1,
-          scenario: scenario.name
+          scenarioName: scenario.name
       }]
     },
     services: scenario.services,
@@ -54,5 +55,6 @@ function readDataFromFile(filename) {
 module.exports = {
   createTestDescriptionFromScenario,
   getYamlBytes,
-  readDataFromFile
+  readDataFromFile,
+  SKYRAMP_YAML_VERSION
 }