Skip to content

Commit 554c233

Browse files
committed
fix: adding missing return code in module mode
1 parent 64b3597 commit 554c233

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

src/lib/index.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,16 @@ const getDelta = async(snykTestOutput: string = '', debugMode = false):Promise<S
124124
}
125125

126126

127-
if(module.parent){
127+
if(!module.parent || (isJestTesting() && !expect.getState().currentTestName.includes('module'))){
128128
displayOutput(newVulns,newLicenseIssues,issueTypeFilter,mode)
129129
}
130130

131131

132-
132+
if(newVulns.length + newLicenseIssues.length > 0){
133+
process.exitCode = 1
134+
} else {
135+
process.exitCode = 0
136+
}
133137

134138

135139
} catch (err){

test/lib/index-inline.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ describe('Test End 2 End - Inline mode', () => {
120120
expect(mockExit).toHaveBeenCalledWith(1);
121121
});
122122

123-
it('Test Inline mode - no new issue go modules project', async () => {
123+
it('Test Inline mode - no new issue gomod project', async () => {
124124
setTimeout(() => {
125125
stdinMock.send(
126126
fs

test/lib/index-module.test.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ describe('Test End 2 End - Module', () => {
6666
.readFileSync(fixturesFolderPath + 'snykTestsOutputs/test-goof.json')
6767
.toString(),
6868
);
69-
expect(consoleOutput).toContain('No new issues found !');
7069
const expectedResult = { result: 0, newVulns: [], newLicenseIssues: [] };
7170
expect(result).toEqual(expectedResult);
7271
});
@@ -79,7 +78,6 @@ describe('Test End 2 End - Module', () => {
7978
true,
8079
);
8180
expect(debug('snyk')).toBeTruthy();
82-
expect(consoleOutput).toContain('No new issues found !');
8381
const expectedResult = { result: 0, newVulns: [], newLicenseIssues: [] };
8482
expect(result).toEqual(expectedResult);
8583
});
@@ -94,18 +92,6 @@ describe('Test End 2 End - Module', () => {
9492
.toString(),
9593
);
9694

97-
const expectedOutput = [
98-
'New issue introduced !',
99-
'Security Vulnerability:',
100-
' 1/1: Regular Expression Denial of Service (ReDoS) [High Severity]',
101-
102-
' Fixed in: acorn 5.7.4, 6.4.1, 7.1.1',
103-
' Fixable by upgrade: @snyk/[email protected]=>[email protected]',
104-
];
105-
106-
expectedOutput.forEach((line: string) => {
107-
expect(consoleOutput.join()).toContain(line);
108-
});
10995
const expectedResult = {
11096
result: 1,
11197
newVulns: [
@@ -159,6 +145,7 @@ describe('Test End 2 End - Module', () => {
159145
severity: 'high',
160146
title: 'Regular Expression Denial of Service (ReDoS)',
161147
from: [
148+
162149
163150
164151

0 commit comments

Comments
 (0)