Merge pull request #35 from alexalvess/feature/change-coverage-model

insert other way to replace variables

Author: alexalvess

buildAndReleaseTask/index.ts

@@ -97,6 +97,7 @@ function processPostmanTestResults(testType: TestType, testResultPath: string) {
         debug(`Files found in Directory: ${JSON.stringify(files)}`);
     });
 
+    debug(`Test type selected: ${testType}`);
     if(testType === TestType.Postman) {
         let fileTestResult = fs.readFileSync(testResultPath, 'utf8');
         let jsonTestResult = JSON.parse(fileTestResult);

buildAndReleaseTask/models/EndpointModel.ts

@@ -15,7 +15,7 @@ export class EndpointModel {
         return new EndpointModel(id, path, verb, isSuccess);
     }
 
-    public static buildFullPath(paths: string[], queries: {key: string, value: string}[]): string {
+    public static buildFullPath(paths: string[], queries: {key: string, value: string}[], variables: [any]): string {
         let fullPath = '';
 
         if(!paths || paths.length === 0)
@@ -24,10 +24,15 @@ export class EndpointModel {
         paths.forEach(el => {
             if(el.includes(':'))
                 fullPath += `/{${el.slice(1)}}`;
-            else
+            else if(el.includes('{{')) {
+                const key = el.replace('{{', '').replace('}}', '');
+                fullPath += `/${variables.find(f => f.key === key)?.value}`
+            } else
                 fullPath += `/${el}`;
         });
 
+        fullPath = fullPath.substring(fullPath.indexOf("/api"));
+
         queries.forEach((el, index) => {
             if(index === 0)
                 fullPath += '?';

buildAndReleaseTask/task.json

@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 1,
-    "Patch": 34
+    "Patch": 35
   },
   "instanceNameFormat": "API Coverage Test",
   "groups": [

buildAndReleaseTask/utils/mappers.ts

@@ -4,17 +4,17 @@ export function postmanMap(testResult: any): EndpointModel[] {
     if(!testResult)
         throw new Error("No test were found.");
 
-    return discoverPath(testResult.collection.item, testResult.run.executions, []);
+    return discoverPath(testResult.collection.item, testResult.run.executions, testResult.environment.values, []);
 }
 
-function discoverPath(items: [], executions: [], paths: Array<EndpointModel>): Array<EndpointModel> {
+function discoverPath(items: [], executions: [], variables: [any], paths: Array<EndpointModel>): Array<EndpointModel> {
     items.forEach((el: any) => {
         if(el.item)
-            return discoverPath(el.item, executions, paths);
+            return discoverPath(el.item, executions, variables, paths);
 
         const success = hasError(executions, el.id);
 
-        const fullPath = EndpointModel.buildFullPath(el.request.url.path, el.request.url.query);
+        const fullPath = EndpointModel.buildFullPath(el.request.url.path, el.request.url.query, variables);
         paths.push(new EndpointModel(el.id, fullPath, el.request.method, !success));
     });
 

vss-extension.json

@@ -2,7 +2,7 @@
     "manifestVersion": 1,
     "id": "task-702d7430-c3a9-422a-87f2-569ed16ba6be",
     "name": "Coverage API Test",
-    "version": "0.0.105",
+    "version": "0.0.106",
     "publisher": "AlexAlves",
     "targets": [
         {