Merge remote-tracking branch 'origin/master' into v1

Author: cwong-scw

.github/workflows/test.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     branches:
-      - main
+      - master
       - 'releases/*'
 
 jobs:

clilauncher.test.js

@@ -6,13 +6,17 @@ const testInput = "test-resources/testInput.sarif"
 const testOutput = "test-resources/output.sarif";
 const expectedOutput = "test-resources/expected.sarif"
 
-afterAll(async () => {
-    fs.unlink(testOutput, () => {});
-});
+describe('cli launcher tests', () => {
+    afterEach((done) => {
+        fs.unlink(testOutput, done);
+    }, 15000);
 
-test('changed sarif includes Secure Code Warrior info', async () => {
-    await runner.run(testInput, testOutput, null, () => {});
+    it('changed sarif includes Secure Code Warrior info', async () => {
+        await runner.run(testInput, testOutput, null, () => {});
 
-    expect(fs.readFileSync(testOutput)).toEqual(fs.readFileSync(expectedOutput));
-});
+        const jsonOutput = JSON.stringify(JSON.parse(fs.readFileSync(testOutput, { encoding: 'utf8' })), null, 2);
+        const jsonExpected = JSON.stringify(JSON.parse(fs.readFileSync(expectedOutput, { encoding: 'utf8' })), null, 2);
 
+        expect(jsonOutput).toEqual(jsonExpected);
+    }, 15000);
+});