Update vitest (#97)

hiroki0525 · Jan 11, 2024 · 16a4192 · 16a4192
1 parent 8446b6e
commit 16a4192
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 109 deletions.
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "tsx": "^4.7.0",
     "turbo": "^1.11.3",
     "typescript": "5.3.3",
-    "vitest": "^0.34.6"
+    "vitest": "^1.1.3"
   },
   "packageManager": "pnpm@8.14.0",
   "engines": {

diff --git a/packages/cli/src/core/__tests__/index.test.ts b/packages/cli/src/core/__tests__/index.test.ts
@@ -16,13 +16,6 @@ import generateDandoriTasks, {
   OptionalTaskPropsOption,
 } from "@dandori/core";
 
-const { actualLoadFile } = await vi.hoisted(async () => {
-  const actualModule = await import("@dandori/libs");
-  return {
-    actualLoadFile: actualModule.loadFile,
-  };
-});
-
 const tasks: DandoriTask[] = [
   {
     id: "1",
@@ -39,13 +32,14 @@ vi.mock("@dandori/core", () => ({
 
 const mockLogError = vi.fn();
 
-vi.mock("@dandori/libs", () => {
+vi.mock("@dandori/libs", async (importOriginal) => {
+  const actualModule = await importOriginal<typeof import("@dandori/libs")>();
   return {
+    ...actualModule,
     getLogLevel: () => "info",
     getLogger: vi.fn(() => ({
       error: mockLogError,
     })),
-    loadFile: actualLoadFile,
   };
 });
 

diff --git a/packages/cli/src/notion/__tests__/index.test.ts b/packages/cli/src/notion/__tests__/index.test.ts
@@ -64,7 +64,7 @@ describe("DandoriNotionCli", () => {
     });
 
     it("call generateDandoriNotionPages with database id", () => {
-      expect(mockGenerateDandoriNotionPages.mock.lastCall[1]).toContain({
+      expect(mockGenerateDandoriNotionPages.mock.lastCall[1]).toMatchObject({
         databaseId,
       });
     });
@@ -81,7 +81,7 @@ describe("DandoriNotionCli", () => {
     it("call generateDandoriNotionPages with databasePropertiesMap.name", () => {
       expect(
         mockGenerateDandoriNotionPages.mock.lastCall[1].databasePropertiesMap,
-      ).toContain({
+      ).toMatchObject({
         name,
       });
     });
@@ -98,7 +98,7 @@ describe("DandoriNotionCli", () => {
     it("call generateDandoriNotionPages with databasePropertiesMap.deadline", () => {
       expect(
         mockGenerateDandoriNotionPages.mock.lastCall[1].databasePropertiesMap,
-      ).toContain({
+      ).toMatchObject({
         deadline,
       });
     });
@@ -115,7 +115,7 @@ describe("DandoriNotionCli", () => {
     it("call generateDandoriNotionPages with databasePropertiesMap.status", () => {
       expect(
         mockGenerateDandoriNotionPages.mock.lastCall[1].databasePropertiesMap,
-      ).toContain({
+      ).toMatchObject({
         status,
       });
     });
@@ -132,7 +132,7 @@ describe("DandoriNotionCli", () => {
     it("call generateDandoriNotionPages with databasePropertiesMap.status.todo", () => {
       expect(
         mockGenerateDandoriNotionPages.mock.lastCall[1].databasePropertiesMap,
-      ).toContain({
+      ).toMatchObject({
         "status.todo": statusTodo,
       });
     });
@@ -149,7 +149,7 @@ describe("DandoriNotionCli", () => {
     it("call generateDandoriNotionPages with databasePropertiesMap.status.doing", () => {
       expect(
         mockGenerateDandoriNotionPages.mock.lastCall[1].databasePropertiesMap,
-      ).toContain({
+      ).toMatchObject({
         "status.doing": statusDoing,
       });
     });
@@ -166,7 +166,7 @@ describe("DandoriNotionCli", () => {
     it("call generateDandoriNotionPages with databasePropertiesMap.status.done", () => {
       expect(
         mockGenerateDandoriNotionPages.mock.lastCall[1].databasePropertiesMap,
-      ).toContain({
+      ).toMatchObject({
         "status.done": statusDone,
       });
     });