Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Repair frontend and kernel regression tests

Daniel0e2df0a0edf6
diff --git a/app/electron/connectionManager.test.js b/app/electron/connectionManager.test.js
index ee18dc51fb..4d806bd4c1 100644
--- a/app/electron/connectionManager.test.js
+++ b/app/electron/connectionManager.test.js
@@ -173,6 +173,7 @@ if (!process.versions.electron) {
window.siyuan = {languages: ${JSON.stringify(strings)}, config: {lang: "en"}, dialogs: [], zIndex: 1,
menus: {menu: {element: document.createElement("div"), remove() {}}}};
const modules = {
+ "../block/panelOwnership": {getDialogBlockPanel() {}, destroyDialogBlockPanels() {}},
electron: require("electron"),
"../util/genID": {genUUID: () => "test-dialog"},
"./moveResize": {moveResize() {}},
diff --git a/app/src/boot/globalEvent/globalShortcut.test.ts b/app/src/boot/globalEvent/globalShortcut.test.ts
index 11b38eb0b2..2c37f78e21 100644
--- a/app/src/boot/globalEvent/globalShortcut.test.ts
+++ b/app/src/boot/globalEvent/globalShortcut.test.ts
@@ -29,6 +29,7 @@ const setup = (detached = false) => {
const registeredCommands: ICommand[] = [];
const document = {activeElement: {matches: () => false}};
const dependencies: Record<string, unknown> = {
+ "../config/setting/windowContext": {isSettingsWindow: () => false},
"../../config/setting/windowContext": {getSettingsWindowHost: (): undefined => undefined},
"../../constants": {Constants: {SIYUAN_HOTKEY: "siyuan-hotkey"}},
"../../util/functions": {isWindow: () => detached},
diff --git a/app/src/dialog/inputDialog.test.ts b/app/src/dialog/inputDialog.test.ts
index cd81ede6d8..bb918cccc1 100644
--- a/app/src/dialog/inputDialog.test.ts
+++ b/app/src/dialog/inputDialog.test.ts
@@ -176,7 +176,7 @@ for (const file of ["src/history/doc.ts", "src/history/history.ts"]) {
}).outputText, {
openInputDialog: (options: typeof dialogs[number]) => dialogs.push(options),
window: {siyuan: {languages: {jumpToPage: "Page ${x}"}}},
- totalPage: 5, currentPage: 2, pageNumElement: {textContent: "2"}, target: {textContent: "2"},
+ readonly: false, totalPage: 5, currentPage: 2, pageNumElement: {textContent: "2"}, target: {textContent: "2"},
options: {id: "doc"}, fileElement: {}, repoElement: {}, firstPanelElement: {},
showMessage: () => messages++,
renderDoc: (element: unknown, page: number) => pages.push(page),
diff --git a/app/src/mobile/tabs/MobileTabs.startup.test.ts b/app/src/mobile/tabs/MobileTabs.startup.test.ts
index b3bf6ec912..0d9fad5477 100644
--- a/app/src/mobile/tabs/MobileTabs.startup.test.ts
+++ b/app/src/mobile/tabs/MobileTabs.startup.test.ts
@@ -43,7 +43,7 @@ const setup = (storage: Record<string, any> = {}, options: {
const folds: Array<(zoomIn: boolean) => void> = [];
let empty = 0;
let sequence = 0;
- const window: any = {siyuan: {storage: clone(storage), languages: {untitled: "Untitled"},
+ const window: any = {location: {search: ""}, siyuan: {storage: clone(storage), languages: {untitled: "Untitled"},
config: {fileTree: {maxOpenTabCount: 32, tabStartupMode: options.mode || 0}},
mobile: {}, menus: {menu: {remove: () => {}}}}};
if (options.android) {
@@ -96,7 +96,8 @@ const setup = (storage: Record<string, any> = {}, options: {
AbortController, DOMException, console});
api.MobileTabs.prototype.renderOverview = () => {};
api.MobileTabs.prototype.openOverview = () => {};
- const dependencies = {window, Constants: constants, MobileTabs: api.MobileTabs,
+ const dependencies = {window, URLSearchParams, Constants: constants, MobileTabs: api.MobileTabs,
+ processMobileSystemUri: () => {}, parseSiYuanUriInfo: (url: string) => url === "external",
getOpenNotebookCount: () => options.notebooks ?? 1,
parseUriInfo: () => options.uri ? {id: options.uri} : {},
openStandaloneDatabaseItemByURI: () => false, finishMobileStartup: () => {},
diff --git a/app/tests/agentStreamingMarkdown.test.js b/app/tests/agentStreamingMarkdown.test.js
index 39db957e01..8199508861 100644
--- a/app/tests/agentStreamingMarkdown.test.js
+++ b/app/tests/agentStreamingMarkdown.test.js
@@ -14,6 +14,7 @@ const sources = () => {
"layout/dock/agent/AgentMessageRenderer",
"layout/dock/agent/AgentScrollState",
"layout/dock/agent/AgentReasoning",
+ "ai/reasoningEffort",
"protyle/render/setLute",
"protyle/util/inlineElementBoundary",
"protyle/util/tableVirtualizationDOM",
diff --git a/app/tests/coverPicker.test.js b/app/tests/coverPicker.test.js
index 593fff4975..1db018a4cf 100644
--- a/app/tests/coverPicker.test.js
+++ b/app/tests/coverPicker.test.js
@@ -17,6 +17,7 @@ const runCases = async (sources, css, mobile, manifest, languages, image) => {
return {ok: true, json: async () => manifest};
};
const stubs = {
+ "block/panelOwnership": {getDialogBlockPanel() {}, destroyDialogBlockPanels() {}},
"util/functions": {isMobile: () => mobile},
"util/genID": {genUUID: () => "cover-picker"},
"util/zIndex": {isAbove: () => false},
diff --git a/app/tests/historySnapshots.test.js b/app/tests/historySnapshots.test.js
index faa4ea6aea..1eab22b092 100644
--- a/app/tests/historySnapshots.test.js
+++ b/app/tests/historySnapshots.test.js
@@ -26,6 +26,7 @@ const runCases = async (sources, css, mobile, dark) => {
const files = [{id: "doc-file", path: "/notebook/project/document.sy"}, ...Array.from({length: 20}, (_, i) => ({id: "file-" + i, path: "/notebook/project/note-" + i + ".sy"}))];
let nextID = 0;
const stubs = {
+ "block/panelOwnership": {getDialogBlockPanel() {}, destroyDialogBlockPanels() {}},
"util/genID": {genUUID: () => String(++nextID)},
"util/zIndex": {isAbove: () => false},
"dialog/moveResize": {moveResize() {}},
diff --git a/app/tests/mobileBacklinks.test.js b/app/tests/mobileBacklinks.test.js
index 551528e3c9..6b5959761e 100644
--- a/app/tests/mobileBacklinks.test.js
+++ b/app/tests/mobileBacklinks.test.js
@@ -29,6 +29,7 @@ const runCases = async (sources) => {
const requests = [];
const tick = () => new Promise(resolve => setTimeout(resolve, 10));
const stubs = {
+ "block/panelOwnership": {getDialogBlockPanel() {}, destroyDialogBlockPanels() {}},
"editor/assetOpen": {normalizeAssetOpenConfig: value => value},
"layout/dock/backlinkRefFilterMenu": {loadBacklinkRefFilterMenu: noop},
"protyle/render/av/editorSession": {hasAVEditorSession: () => false},
diff --git a/app/tests/settingsTabs.test.js b/app/tests/settingsTabs.test.js
index 66eaf5192a..e9106acdfc 100644
--- a/app/tests/settingsTabs.test.js
+++ b/app/tests/settingsTabs.test.js
@@ -59,7 +59,7 @@ for (const mobile of [false, true]) {
const shells = exports.getSettingTabDefs();
assert.deepEqual(Array.from(shells, shell => shell.id), [
"editor", "file", "appearance", "bazaar", "flashcard", "ai", "secretsVariables", "assets",
- "export", "search", ...(mobile ? [] : ["keymap"]), "sync", "access", "app", "about",
+ "ocr", "export", "search", ...(mobile ? [] : ["keymap"]), "sync", "access", "app", "about",
]);
assert.equal(exports.getSettingTab("appearance"), appearance);
assert.equal(exports.getSettingTabDefs(), shells);
diff --git a/app/tests/settingsWindow.test.js b/app/tests/settingsWindow.test.js
index 80d6878627..74549c6feb 100644
--- a/app/tests/settingsWindow.test.js
+++ b/app/tests/settingsWindow.test.js
@@ -614,12 +614,13 @@ if (process.versions.electron && process.type === "browser") {
const {test} = require("node:test");
const {execFile} = require("node:child_process");
const {promisify} = require("node:util");
- test("native settings preserve plugin controls, callbacks, default dialogs and owning-window lifecycle", async () => {
+ test("native settings preserve plugin controls, callbacks, default dialogs and owning-window lifecycle", {timeout: 120000}, async () => {
const profile = fs.mkdtempSync(path.join(os.tmpdir(), "siyuan-settings-window-"));
const env = {...process.env};
delete env.ELECTRON_RUN_AS_NODE;
try {
- await promisify(execFile)(require("electron"), [__filename, profile], {env, windowsHide: true, timeout: 30000});
+ // 两轮窗口生命周期包含多个原生命中测试子进程,为 CI 启动开销预留时间。
+ await promisify(execFile)(require("electron"), [__filename, profile], {env, windowsHide: true, timeout: 110000});
} finally {
assert.equal(path.dirname(path.resolve(profile)), path.resolve(os.tmpdir()));
fs.rmSync(profile, {recursive: true, force: true, maxRetries: 5, retryDelay: 100});
diff --git a/app/tests/textSelectionContextMenu.test.js b/app/tests/textSelectionContextMenu.test.js
index d22ba140f5..3ceea529be 100644
--- a/app/tests/textSelectionContextMenu.test.js
+++ b/app/tests/textSelectionContextMenu.test.js
@@ -24,7 +24,7 @@ const sources = () => {
node.declarationList.declarations.some(item => item.name.getText(selection) === "getEditorRange"));
assert.ok(range);
const wordSelection = readFileSync(path.join(__dirname, "../src/mobile/util/wordSelection.ts"), "utf8")
- .replace("export const ", "const ");
+ .replaceAll("export const ", "const ");
const preprocess = (source, mobile) => {
const active = [true];
return source.split("\n").filter(line => {
diff --git a/kernel/api/asset_notification_test.go b/kernel/api/asset_notification_test.go
index 015ac1f73c..5cfdf546d4 100644
--- a/kernel/api/asset_notification_test.go
+++ b/kernel/api/asset_notification_test.go
@@ -130,10 +130,7 @@ func testAPIContractUnusedNotificationScope(t *testing.T, attributeViews bool) {
var event struct {
Cmd string
Code int
- Data struct {
- ID string
- CloseTimeout int
- }
+ Data json.RawMessage
}
if err := connection.ReadJSON(&event); err != nil {
t.Fatal(err)
@@ -141,7 +138,18 @@ func testAPIContractUnusedNotificationScope(t *testing.T, attributeViews bool) {
if event.Cmd == "barrier" {
break
}
- if event.Cmd != "msg" || event.Code != 0 || event.Data.ID == "" || event.Data.CloseTimeout != 5000 {
+ // 同一连接也会收到后台状态事件,仅解码并统计提示消息。
+ if event.Cmd != "msg" {
+ continue
+ }
+ var data struct {
+ ID string
+ CloseTimeout int
+ }
+ if err := json.Unmarshal(event.Data, &data); err != nil {
+ t.Fatal(err)
+ }
+ if event.Code != 0 || data.ID == "" || data.CloseTimeout != 5000 {
t.Fatalf("unexpected notification: %+v", event)
}
count++
diff --git a/kernel/api/contract_system_test.go b/kernel/api/contract_system_test.go
index 3890c6f22d..a8735edeb1 100644
--- a/kernel/api/contract_system_test.go
+++ b/kernel/api/contract_system_test.go
@@ -45,9 +45,27 @@ func TestAPIContractSystemCompleteConfiguration(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- before, _ := json.Marshal(source)
- after, _ := json.Marshal(payload)
- if !bytes.Equal(before, after) {
+ before, err := json.Marshal(source)
+ if err != nil {
+ t.Fatal(err)
+ }
+ after, err := json.Marshal(payload)
+ if err != nil {
+ t.Fatal(err)
+ }
+ // 配置字段顺序不属于 JSON 契约,递归比较字段和值。
+ var sourceJSON, payloadJSON any
+ decoder := json.NewDecoder(bytes.NewReader(before))
+ decoder.UseNumber()
+ if err := decoder.Decode(&sourceJSON); err != nil {
+ t.Fatal(err)
+ }
+ decoder = json.NewDecoder(bytes.NewReader(after))
+ decoder.UseNumber()
+ if err := decoder.Decode(&payloadJSON); err != nil {
+ t.Fatal(err)
+ }
+ if !reflect.DeepEqual(sourceJSON, payloadJSON) {
t.Fatalf("complete configuration changed:\n%s\n%s", before, after)
}
body, err := json.Marshal(apicontract.Success(apicontract.SystemConfData{Conf: payload}))
diff --git a/kernel/model/transaction_fold_fts5_test.go b/kernel/model/transaction_fold_fts5_test.go
index 32d2028250..2f43706dd6 100644
--- a/kernel/model/transaction_fold_fts5_test.go
+++ b/kernel/model/transaction_fold_fts5_test.go
@@ -499,6 +499,8 @@ func setupFoldTransactionDatabase(t *testing.T, fixture *fileOperationTestFixtur
treenode.UpsertBlockTree(tree)
}
t.Cleanup(func() {
+ // 清理异步索引操作,避免测试工作区关闭后仍有待处理任务。
+ sql.ClearQueue()
sql.CloseDatabase()
util.TempDir = originalTempDir
util.QueueDir = originalQueueDir
diff --git a/kernel/util/working_home_test.go b/kernel/util/working_home_test.go
index 86bf286af1..e65d4ff9f0 100644
--- a/kernel/util/working_home_test.go
+++ b/kernel/util/working_home_test.go
@@ -27,16 +27,9 @@ func TestSetHomeDir(t *testing.T) {
}
base := t.TempDir()
- cwd, err := os.Getwd()
- if err != nil {
- t.Fatal(err)
- }
- relative, err := filepath.Rel(cwd, filepath.Join(base, "relative-home"))
- if err != nil {
- t.Fatal(err)
- }
- for _, path := range []string{filepath.Join(base, "absolute-home"), relative} {
- if err = SetHomeDir(path); err != nil {
+ t.Chdir(base)
+ for _, path := range []string{filepath.Join(base, "absolute-home"), "relative-home"} {
+ if err := SetHomeDir(path); err != nil {
t.Fatalf("SetHomeDir(%q): %v", path, err)
}
want, _ := filepath.Abs(path)