Skip to content

Commit

Permalink
refactor: Rename errorMappedResults to mappedResults
Browse files Browse the repository at this point in the history 
Renaming the object as in IaC the logic does more than mapping
the results.
  • Loading branch information
@snaftaly
snaftaly committed Jan 5, 2022
1 parent 8c93f31 commit 5805f4f
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
6 changes: 3 additions & 3 deletions src/cli/commands/test/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export default async function test(
// resultOptions is now an array of 1 or more options used for
// the tests results is now an array of 1 or more test results
// values depend on `options.json` value - string or object
const errorMappedResults = !options.iac
const mappedResults = !options.iac
? createErrorMappedResultsForJsonOutput(results)
: results.map(mapIacTestResult);

Expand All @@ -167,11 +167,11 @@ export default async function test(
stringifiedData,
stringifiedJsonData,
stringifiedSarifData,
} = extractDataToSendFromResults(results, errorMappedResults, options);
} = extractDataToSendFromResults(results, mappedResults, options);

if (options.json || options.sarif) {
// if all results are ok (.ok == true)
if (errorMappedResults.every((res) => res.ok)) {
if (mappedResults.every((res) => res.ok)) {
return TestCommandResult.createJsonTestCommandResult(
stringifiedData,
stringifiedJsonData,
Expand Down
4 changes: 2 additions & 2 deletions src/lib/formatters/test/format-test-results.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function formatJsonVulnerabilityStructure(jsonResult, options: Options) {

export function extractDataToSendFromResults(
results,
errorMappedResults,
mappedResults,
options: Options,
): OutputDataTypes {
let sarifData = {};
Expand All @@ -85,7 +85,7 @@ export function extractDataToSendFromResults(
stringifiedSarifData = jsonStringifyLargeObject(sarifData);
}

const jsonResults = errorMappedResults.map((res) =>
const jsonResults = mappedResults.map((res) =>
createJsonResultOutput(res, options),
);

Expand Down
40 changes: 21 additions & 19 deletions test/jest/unit/lib/formatters/test/format-test-results.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ describe('extractDataToSendFromResults', () => {
const resultsFixture = JSON.parse(
fs.readFileSync('test/fixtures/basic-npm/results.json', 'utf-8'),
);
const errorMappedResultsFixture = JSON.parse(

const mappedResultsFixture = JSON.parse(
fs.readFileSync('test/fixtures/basic-npm/jsonData.json', 'utf-8'),
);

Expand All @@ -20,7 +21,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(0);
Expand All @@ -36,7 +37,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -51,7 +52,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -68,7 +69,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -84,7 +85,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -99,7 +100,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -116,7 +117,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -135,7 +136,7 @@ describe('extractDataToSendFromResults', () => {
),
);

const errorMappedResultsFixture = JSON.parse(
const mappedResultsFixture = JSON.parse(
fs.readFileSync(
'test/fixtures/npm/issue-grouping/singleProjectJsonData.json',
'utf-8',
Expand Down Expand Up @@ -164,7 +165,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -186,7 +187,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -210,7 +211,7 @@ describe('extractDataToSendFromResults', () => {
),
);

const errorMappedResultsFixture = JSON.parse(
const mappedResultsFixture = JSON.parse(
fs.readFileSync(
'test/fixtures/npm/issue-grouping/multiProjectJsonData.json',
'utf-8',
Expand Down Expand Up @@ -239,7 +240,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -264,7 +265,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsFixture,
errorMappedResultsFixture,
mappedResultsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -288,7 +289,8 @@ describe('extractDataToSendFromResults', () => {
const resultsContainerFixture = JSON.parse(
fs.readFileSync('test/fixtures/basic-apk/results.json', 'utf-8'),
);
const errorMappedResultsContainerFixture = JSON.parse(

const mappedResultsContainerFixture = JSON.parse(
fs.readFileSync('test/fixtures/basic-apk/jsonData.json', 'utf-8'),
);
const resultJsonDataGroupedContainerFixture = JSON.parse(
Expand All @@ -306,7 +308,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsContainerFixture,
errorMappedResultsContainerFixture,
mappedResultsContainerFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -326,7 +328,7 @@ describe('extractDataToSendFromResults', () => {
'utf-8',
),
);
const errorMappedResultsAppVulnsFixture = JSON.parse(
const mappedResultsAppVulnsFixture = JSON.parse(
fs.readFileSync(
'test/fixtures/container-app-vulns/jsonData.json',
'utf-8',
Expand All @@ -353,7 +355,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsContainerAppVulnsFixture,
errorMappedResultsAppVulnsFixture,
mappedResultsAppVulnsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand All @@ -378,7 +380,7 @@ describe('extractDataToSendFromResults', () => {
const jsonStringifySpy = jest.spyOn(JSON, 'stringify');
const res = extractDataToSendFromResults(
resultsContainerAppVulnsFixture,
errorMappedResultsAppVulnsFixture,
mappedResultsAppVulnsFixture,
options,
);
expect(jsonStringifySpy).toHaveBeenCalledTimes(1);
Expand Down

0 comments on commit 5805f4f

Please sign in to comment.