Merge pull request #2223 from github/dependabot/npm_and_yarn/extensions/ql-vscode/fs-extra-and-types/fs-extra-11.1.1

Bump fs-extra and @types/fs-extra in /extensions/ql-vscode

Author: charisk

extensions/ql-vscode/package-lock.json

@@ -1441,7 +1441,7 @@
     "classnames": "~2.2.6",
     "d3": "^7.6.1",
     "d3-graphviz": "^5.0.2",
-    "fs-extra": "^10.0.1",
+    "fs-extra": "^11.1.1",
     "glob-promise": "^6.0.2",
     "immutable": "^4.0.0",
     "js-yaml": "^4.1.0",
@@ -1492,7 +1492,7 @@
     "@types/d3": "^7.4.0",
     "@types/d3-graphviz": "^2.6.6",
     "@types/del": "^4.0.0",
-    "@types/fs-extra": "^9.0.6",
+    "@types/fs-extra": "^11.0.1",
     "@types/glob": "^7.1.1",
     "@types/google-protobuf": "^3.2.7",
     "@types/gulp": "^4.0.9",

extensions/ql-vscode/package.json

@@ -88,13 +88,18 @@ export class Recorder extends DisposableObject {
 
         const bodyFileName = `${i}-${writtenRequest.request.kind}.body.${extension}`;
         const bodyFilePath = join(scenarioDirectory, bodyFileName);
-        await writeFile(bodyFilePath, writtenRequest.response.body);
+
+        let bodyFileLink = undefined;
+        if (writtenRequest.response.body) {
+          await writeFile(bodyFilePath, writtenRequest.response.body || "");
+          bodyFileLink = `file:${bodyFileName}`;
+        }
 
         writtenRequest = {
           ...writtenRequest,
           response: {
             ...writtenRequest.response,
-            body: `file:${bodyFileName}`,
+            body: bodyFileLink,
           },
         };
       }

extensions/ql-vscode/src/mocks/recorder.ts

@@ -1,4 +1,3 @@
-import * as fs from "fs-extra";
 import { Uri, WorkspaceFolder } from "vscode";
 
 import { QLTestAdapter } from "../../../src/test-adapter";
@@ -19,8 +18,6 @@ jest.mock("fs-extra", () => {
   };
 });
 
-const mockedFsExtra = jest.mocked(fs);
-
 describe("test-adapter", () => {
   let adapter: QLTestAdapter;
   let fakeDatabaseManager: DatabaseManager;
@@ -131,8 +128,6 @@ describe("test-adapter", () => {
   });
 
   it("should reregister testproj databases around test run", async () => {
-    mockedFsExtra.access.mockResolvedValue(undefined);
-
     currentDatabaseItem = preTestDatabaseItem;
     databaseItems = [preTestDatabaseItem];
     await adapter.run(["/path/to/test/dir"]);