fix unit test

Author: cyfung1031

src/app/service/service_worker/synchronize.test.ts

@@ -905,7 +905,6 @@ console.log("ok");`
       "push-uuid.user.js": "etag-user-js",
     });
   });
-
   it("skips status and digest update when a push hits remote conflict", async () => {
     const conflict = new FileSystemError({
       provider: "webdav",
@@ -941,20 +940,16 @@ console.log("ok");`
         ]),
       } as any
     );
+
     vi.spyOn(service, "pushScript").mockRejectedValue(conflict);
     const updateDigestSpy = vi.spyOn(service, "updateFileDigest");
-    const notificationSpy = vi.spyOn(chrome.notifications, "create").mockReturnValue("notification-id" as any);
+    const notifySpy = vi.spyOn(service, "notifySyncFailed").mockImplementation(() => {});
 
     await service.syncOnce(syncConfig, fs);
 
     expect(updateDigestSpy).not.toHaveBeenCalled();
     expect(fs.create).not.toHaveBeenCalledWith("scriptcat-sync.json", expect.anything());
-    expect(notificationSpy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        title: "Script Sync Failed",
-        message: expect.stringContaining("remote conflict"),
-      })
-    );
+    expect(notifySpy).toHaveBeenCalledWith(true, 1);
   });
 
   it("skips status and digest update when any push task fails", async () => {
@@ -987,20 +982,16 @@ console.log("ok");`
         ]),
       } as any
     );
+
     vi.spyOn(service, "pushScript").mockRejectedValue(error);
     const updateDigestSpy = vi.spyOn(service, "updateFileDigest");
-    const notificationSpy = vi.spyOn(chrome.notifications, "create").mockReturnValue("notification-id" as any);
+    const notifySpy = vi.spyOn(service, "notifySyncFailed").mockImplementation(() => {});
 
     await service.syncOnce(syncConfig, fs);
 
     expect(updateDigestSpy).not.toHaveBeenCalled();
     expect(fs.create).not.toHaveBeenCalledWith("scriptcat-sync.json", expect.anything());
-    expect(notificationSpy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        title: "Script Sync Failed",
-        message: expect.stringContaining("cloud sync changes failed"),
-      })
-    );
+    expect(notifySpy).toHaveBeenCalledWith(false, 1);
   });
 
   it("scriptInstall enters cloud_sync queue and updates digest after push", async () => {

src/app/service/service_worker/synchronize.ts

@@ -364,6 +364,18 @@ export class SynchronizeService {
     });
   }
 
+  public notifySyncFailed(hasConflict: any, rejectedCount: number) {
+    this.logger.warn("skip status and digest update because cloud sync task failed", {
+      conflict: hasConflict,
+      failed: rejectedCount,
+    });
+    const title = i18n.t("notification.script_sync_failed");
+    const message = hasConflict
+      ? i18n.t("notification.script_sync_conflict_desc")
+      : i18n.t("notification.script_sync_failed_desc");
+    InfoNotification(title, message);
+  }
+
   private async syncOnceInternal(syncConfig: CloudSyncConfig, fs: FileSystem) {
     this.logger.info("start sync once");
     // 获取文件列表
@@ -501,15 +513,7 @@ export class SynchronizeService {
     const rejected = syncResults.filter((ret) => ret.status === "rejected");
     if (rejected.length) {
       const hasConflict = rejected.some((ret) => isConflictError(ret.reason));
-      this.logger.warn("skip status and digest update because cloud sync task failed", {
-        conflict: hasConflict,
-        failed: rejected.length,
-      });
-      const title = i18n.t("notification.script_sync_failed");
-      const message = hasConflict
-        ? i18n.t("notification.script_sync_conflict_desc")
-        : i18n.t("notification.script_sync_failed_desc");
-      InfoNotification(title, message);
+      this.notifySyncFailed(hasConflict, rejected.length);
       return;
     }
     // 同步状态