andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

Try fixing E2E tests more

Browse source
This commit is contained in:
Andras Schmelczer 2025-12-11 22:08:48 +00:00
parent 387e7afd58
commit f6dccc4492
6 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/sync-client/src/file-operations/file-operations.test.ts
View file

@ -12,7 +12,7 @@ import type { TextWithCursors } from "reconcile-text";
import type { ServerConfig, ServerConfigData } from "../services/server-config";
class MockServerConfig implements Pick<ServerConfig, "getConfig"> {
public getConfig(): ServerConfigData {
public async getConfig(): Promise<ServerConfigData> {
return {
mergeableFileExtensions: ["md", "txt"],
supportedApiVersion: 1,

2
frontend/sync-client/src/file-operations/file-operations.ts
View file

@ -97,7 +97,7 @@ export class FileOperations {
if (
!isFileTypeMergable(
path,
this.serverConfig.getConfig().mergeableFileExtensions
(await this.serverConfig.getConfig()).mergeableFileExtensions
) ||
isBinary(expectedContent) ||
isBinary(newContent)