Merge pull request #2671 from github/robertbrignull/sarif-parser-unit-test

Move sarif-parser.test.ts from no-workspace to unit-tests

extensions/ql-vscode/src/view/results/__tests__/results.spec.tsx

@@ -12,10 +12,7 @@ import { ColumnKindCode } from "../../../common/bqrs-cli-types";
 import { postMessage } from "../../common/post-message";
 
 const exampleSarif = fs.readJSONSync(
-  resolve(
-    __dirname,
-    "../../../../test/vscode-tests/no-workspace/data/sarif/validSarif.sarif",
-  ),
+  resolve(__dirname, "../../../../test/data/sarif/validSarif.sarif"),
 );
 
 describe(ResultsApp.name, () => {

extensions/ql-vscode/test/unit-tests/common/sarif-parser.test.ts

@@ -1,9 +1,9 @@
 import { join } from "path";
 
-import { sarifParser } from "../../../../src/common/sarif-parser";
+import { sarifParser } from "../../../src/common/sarif-parser";
 
 describe("sarif parser", () => {
-  const sarifDir = join(__dirname, "../data/sarif");
+  const sarifDir = join(__dirname, "../../data/sarif");
   it("should parse a valid SARIF file", async () => {
     const result = await sarifParser(join(sarifDir, "validSarif.sarif"));
     expect(result.version).toBeDefined();

extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-results-manager.test.ts

@@ -279,10 +279,7 @@ describe(VariantAnalysisResultsManager.name, () => {
           await fs.outputJson(
             join(repoTaskStorageDirectory, "results/results.sarif"),
             await fs.readJson(
-              resolve(
-                __dirname,
-                "../../no-workspace/data/sarif/validSarif.sarif",
-              ),
+              resolve(__dirname, "../../../data/sarif/validSarif.sarif"),
             ),
           );
         });