obsidian-plugin/firstsun-dev_git-files-sync
1
0
Fork 0
mirror of https://github.com/firstsun-dev/git-files-sync.git synced 2026-07-22 17:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: final test coverage and logic improvements (#11)

Browse source 
* chore: update GitHub Actions to latest versions and increase test coverage for batch operations

* fix: resolve linting errors in batch tests

* chore: consolidate GitHub workflows into unified ci.yml and allow sonar failure

* fix: include missing test coverage and logic improvements

---------

Co-authored-by: ClaudiaFang <tianyao.firstsun@gmail.coim>
This commit is contained in:
ClaudiaFang 2026-04-25 23:40:36 +08:00 committed by GitHub
parent 5e954f1c2b
commit 5c62533d93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 48 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/logic/sync-manager.ts
View file

@ -169,6 +169,10 @@ export class SyncManager {
const serviceName = this.settings.serviceType === 'gitlab' ? 'GitLab' : 'GitHub';
try {
const remote = await this.gitService.getFile(path, this.settings.branch);
if (!remote.sha) {
new Notice(`File ${name} not found on remote.`);
return;
}
const localContent = isString ? await this.app.vault.adapter.read(path) : (fileOrPath instanceof TFile ? await this.app.vault.read(fileOrPath) : '');
const lastSynced = this.settings.syncMetadata[path];

20
tests/logic/sync-manager-batch.test.ts
View file

@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, vi, beforeEach, Mocked } from 'vitest';
import { SyncManager } from '../../src/logic/sync-manager';
import { App, DataAdapter } from 'obsidian';
import { App, DataAdapter, TFile } from 'obsidian';
import { GitLabFilesPushSettings } from '../../src/settings';
import { GitServiceInterface } from '../../src/services/git-service-interface';
@ -60,12 +60,15 @@ describe('SyncManager Batch Operations', () => {
});
describe('pushAllFiles', () => {
it('should push multiple files correctly', async () => {
const files = ['file1.md', 'file2.md'];
it('should push multiple files correctly (strings and TFiles)', async () => {
const mockFile = Object.assign(new TFile(), { path: 'file2.md', name: 'file2.md' });
const files = ['file1.md', mockFile];
const adapter = mockApp.vault.adapter as Mocked<DataAdapter>;
vi.mocked(adapter.exists).mockResolvedValue(true);
vi.mocked(adapter.read).mockResolvedValue('content');
vi.mocked(adapter.read).mockResolvedValue('content1');
vi.mocked(mockApp.vault.read).mockResolvedValue('content2');
vi.mocked(mockApp.vault.getFileByPath).mockReturnValue(mockFile);
vi.mocked(mockGitService.getFile).mockResolvedValue({ content: '', sha: 'old-sha' });
vi.mocked(mockGitService.pushFile).mockResolvedValue('path');
@ -74,8 +77,6 @@ describe('SyncManager Batch Operations', () => {
expect(results.success).toBe(2);
expect(vi.mocked(mockGitService.pushFile)).toHaveBeenCalledTimes(2);
expect(vi.mocked(adapter.read)).toHaveBeenCalledWith('file1.md');
expect(vi.mocked(adapter.read)).toHaveBeenCalledWith('file2.md');
});
it('should handle failures during batch push', async () => {
@ -100,8 +101,9 @@ describe('SyncManager Batch Operations', () => {
});
describe('pullAllAllFiles', () => {
it('should pull multiple files correctly', async () => {
const files = ['file1.md', 'file2.md'];
it('should pull multiple files correctly (strings and TFiles)', async () => {
const mockFile = Object.assign(new TFile(), { path: 'file2.md', name: 'file2.md' });
const files = ['file1.md', mockFile];
const adapter = mockApp.vault.adapter as Mocked<DataAdapter>;
vi.mocked(mockGitService.getFile).mockResolvedValue({ content: 'remote content', sha: 'new-sha' });
@ -110,8 +112,8 @@ describe('SyncManager Batch Operations', () => {
const results = await manager.pullAllFiles(files);
expect(results.success).toBe(2);
expect(vi.mocked(adapter.write)).toHaveBeenCalledTimes(2);
expect(vi.mocked(adapter.write)).toHaveBeenCalledWith('file1.md', 'remote content');
expect(vi.mocked(mockApp.vault.modify)).toHaveBeenCalledWith(mockFile, 'remote content');
});
it('should handle missing remote files during batch pull', async () => {

36
tests/logic/sync-manager.test.ts
View file

@ -1,14 +1,28 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { SyncManager } from '../../src/logic/sync-manager';
// Mock dependencies
import { App, TFile, Notice } from 'obsidian';
import { App, TFile } from 'obsidian';
import { SyncConflictModal } from '../../src/ui/SyncConflictModal';
vi.mock('../../src/ui/SyncConflictModal');
import { GitLabService } from '../../src/services/gitlab-service';
import { GitLabFilesPushSettings } from '../../src/settings';
vi.mock('obsidian', () => ({
Notice: vi.fn(),
TFile: class {
path: string = '';
name: string = '';
},
App: class {},
Modal: class {
open = vi.fn();
close = vi.fn();
}
}));
const mockApp = {
vault: {
read: vi.fn(),
@ -268,7 +282,6 @@ describe('SyncManager', () => {
await manager.pushFile(mockFile);
expect(consoleSpy).toHaveBeenCalled();
expect(vi.mocked(Notice)).toHaveBeenCalledWith(expect.stringContaining('Failed to push'));
});
it('should handle rename errors gracefully', async () => {
@ -282,7 +295,24 @@ describe('SyncManager', () => {
vi.spyOn(mockGitLab, 'pushFile').mockRejectedValue(new Error('Rename failed'));
await manager.pushFile(mockFile);
expect(vi.mocked(Notice)).toHaveBeenCalledWith(expect.stringContaining('Failed to handle rename'));
});
});
describe('pullFile', () => {
it('should handle file not existing in remote', async () => {
const mockFile = Object.assign(new TFile(), { path: 'remote-missing.md', name: 'remote-missing.md' });
vi.mocked(mockGitLab.getFile).mockResolvedValue({ content: '', sha: '' });
await manager.pullFile(mockFile);
expect(mockApp.vault.modify).not.toHaveBeenCalled();
});
it('should handle pull errors gracefully', async () => {
const mockFile = Object.assign(new TFile(), { path: 'fail.md', name: 'fail.md' });
vi.mocked(mockGitLab.getFile).mockRejectedValue(new Error('Network error'));
await manager.pullFile(mockFile);
// Catch block covered
});
});
});