update predicate test (#76)

* update predicate test

* update logo

Author: cx-pedro-lopes

.github/workflows/ci.yml

@@ -19,6 +19,7 @@ jobs:
           CX_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET}}
           CX_BASE_URI: ${{ secrets.BASE_URI }}
           CX_TENANT: ${{ secrets.TENANT }}
+          CX_SCANID: ${{ secrets.SCANID }}
         run: npm test
   cx-scan:
     runs-on: ubuntu-latest

logo.png

@@ -4,6 +4,7 @@ export class BaseTest {
     clientId: string = "";
     clientSecret: string = "";
     apiKey: string = "";
+    scanId: string = "";
     pathToExecutable: string;
     tenant: string;
 
@@ -14,6 +15,7 @@ export class BaseTest {
         this.clientSecret = process.env["CX_CLIENT_SECRET"];
         this.tenant = process.env["CX_TENANT"];
         this.apiKey = process.env["CX_APIKEY"];
+        this.scanId = process.env["CX_SCANID"];
         if (process.env["PATH_TO_EXECUTABLE"] !== null && process.env["PATH_TO_EXECUTABLE"] !== undefined) {
             this.pathToExecutable = process.env["PATH_TO_EXECUTABLE"];
         }

src/tests/BaseTest.ts

@@ -2,17 +2,15 @@ import {CxWrapper} from '../main/wrapper/CxWrapper';
 import {CxCommandOutput} from "../main/wrapper/CxCommandOutput";
 import {BaseTest} from "./BaseTest";
 import CxResult from '../main/results/CxResult';
-import CxScan from '../main/scan/CxScan';
 import { CxConstants } from '../main/wrapper/CxConstants';
 
 describe("Triage cases",() => {
     let cxScanConfig = new BaseTest();
 
     it('TriageShow Successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const scanListOutput = await auth.scanList("statuses=Completed");
-        const scan: CxScan = scanListOutput.payload[0]
-        const results = await auth.getResultsList(scan.id)
+        const scan = (await auth.scanShow(cxScanConfig.scanId)).payload.pop();
+        const results = await auth.getResultsList(cxScanConfig.scanId)
         const result: CxResult = results.payload.find(res => res.type == CxConstants.SAST)
 
         const cxCommandOutput: CxCommandOutput = await auth.triageShow(scan.projectID, result.similarityId, result.type);
@@ -22,9 +20,8 @@ describe("Triage cases",() => {
 
     it('TriageUpdate Successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const scanListOutput = await auth.scanList("statuses=Completed");
-        const scan: CxScan = scanListOutput.payload[0]
-        const results = await auth.getResultsList(scan.id)
+        const scan = (await auth.scanShow(cxScanConfig.scanId)).payload.pop();
+        const results = await auth.getResultsList(cxScanConfig.scanId)
         const result: CxResult = results.payload.find(res => res.type == CxConstants.SAST)
 
         const cxCommandOutput: CxCommandOutput = await auth.triageUpdate(scan.projectID, result.similarityId, result.type, CxConstants.STATE_CONFIRMED, "Edited via JavascriptWrapper", result.severity.toLowerCase() == "high" ? CxConstants.SEVERITY_MEDIUM : CxConstants.SEVERITY_HIGH);