mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2026-03-09 08:20:32 -07:00
a0e7a6ec57
Introduce end-to-end tests and server-side support for mobile-style Smart HTTP git sync. Adds a new mobileSyncConflict.feature and extended sync.step definitions to simulate HTTP clone/sync cycles, pushes, and assertions (including file content checks and HTTP readiness/backoff). Introduces src/services/gitServer/mergeUtilities.ts to resolve .tid conflicts (mobile metadata wins, body merged) and common git helpers, and wires those into the git server (use runGitCollectStdout, DESKTOP_GIT_IDENTITY, and mergeAfterPush endpoint). Misc: update workspace restart flow and settings handling, tweak test helpers (skip screenshot capture for file steps), adjust slugify rules, minor UI/formatting change, and bump git-sync-js dependency (with lockfile update).
183 lines
10 KiB
Gherkin
183 lines
10 KiB
Gherkin
Feature: Git Sync
|
|
As a user
|
|
I want to sync my wiki to a remote repository
|
|
So that I can backup and share my content
|
|
|
|
Background:
|
|
Given I cleanup test wiki so it could create a new one on start
|
|
And I launch the TidGi application
|
|
And I wait for the page to load completely
|
|
Then I should see a "default wiki workspace" element with selector "div[data-testid^='workspace-']:has-text('wiki')"
|
|
# Enable file system watch for testing (default is false in production)
|
|
When I update workspace "wiki" settings:
|
|
| property | value |
|
|
| enableFileSystemWatch | true |
|
|
Then the browser view should be loaded and visible
|
|
And I wait for SSE and watch-fs to be ready
|
|
And I wait for "git initialization" log marker "[test-id-git-init-complete]"
|
|
|
|
@git @sync
|
|
Scenario: Sync to local remote repository via application menu (commit and push)
|
|
# Setup a bare git repository as local remote
|
|
When I create a bare git repository at "{tmpDir}/remote-repo-menu.git"
|
|
# Configure sync via edit workspace window
|
|
When I open edit workspace window for workspace with name "wiki"
|
|
And I switch to "editWorkspace" window
|
|
And I wait for the page to load completely
|
|
When I click on "saveAndSyncOptions accordion and syncToCloud toggle" elements with selectors:
|
|
| element description | selector |
|
|
| saveAndSyncOptions accordion| [data-testid='preference-section-saveAndSyncOptions'] |
|
|
| syncToCloud toggle | [data-testid='synced-local-workspace-switch'] |
|
|
When I type in "git url input and github username input and github email input and github token input" elements with selectors:
|
|
| text | selector |
|
|
| {tmpDir}/remote-repo-menu.git | label:has-text('Git仓库线上网址') + * input, label:has-text('Git Repo URL') + * input, input[aria-label='Git仓库线上网址'], input[aria-label='Git Repo URL'] |
|
|
| testuser | [data-testid='github-userName-input'] input |
|
|
| testuser@example.com | [data-testid='github-email-input'] input |
|
|
| test-token-12345 | [data-testid='github-token-input'] input |
|
|
When I click on a "save workspace button" element with selector "[data-testid='edit-workspace-save-button']"
|
|
# Workspace update triggers a restart, need to wait for it to complete before continuing
|
|
Then I should not see a "save workspace button" element with selector "[data-testid='edit-workspace-save-button']"
|
|
When I switch to "main" window
|
|
# Create a new tiddler to trigger sync
|
|
When I create file "{tmpDir}/wiki/tiddlers/SyncMenuTestTiddler.tid" with content:
|
|
"""
|
|
created: 20250226090000000
|
|
modified: 20250226090000000
|
|
title: SyncMenuTestTiddler
|
|
tags: SyncTest
|
|
|
|
This is a test tiddler for sync via menu feature.
|
|
"""
|
|
Then I wait for tiddler "SyncMenuTestTiddler" to be added by watch-fs
|
|
# Clear previous test markers to ensure we're testing fresh sync operation
|
|
When I clear test-id markers from logs
|
|
# Use application menu to sync (commit and push)
|
|
When I click menu "知识库 > 立即同步云端"
|
|
# Wait for git sync to complete (not just commit)
|
|
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
|
# Verify the commit was pushed to remote by cloning the remote and checking
|
|
Then the remote repository "{tmpDir}/remote-repo-menu.git" should contain commit with message "使用太记桌面版备份"
|
|
And the remote repository "{tmpDir}/remote-repo-menu.git" should contain file "tiddlers/SyncMenuTestTiddler.tid"
|
|
|
|
@git @sync
|
|
Scenario: Resolve diverged histories during cloud sync (append auto-merge and same-line conflict)
|
|
# Setup bare repo as cloud remote and configure sync
|
|
When I create a bare git repository at "{tmpDir}/remote-diverge.git"
|
|
When I open edit workspace window for workspace with name "wiki"
|
|
And I switch to "editWorkspace" window
|
|
And I wait for the page to load completely
|
|
When I click on "saveAndSyncOptions accordion and syncToCloud toggle" elements with selectors:
|
|
| element description | selector |
|
|
| saveAndSyncOptions accordion| [data-testid='preference-section-saveAndSyncOptions'] |
|
|
| syncToCloud toggle | [data-testid='synced-local-workspace-switch'] |
|
|
When I type in "git url input and github username input and github email input and github token input" elements with selectors:
|
|
| text | selector |
|
|
| {tmpDir}/remote-diverge.git | label:has-text('Git仓库线上网址') + * input, label:has-text('Git Repo URL') + * input, input[aria-label='Git仓库线上网址'], input[aria-label='Git Repo URL'] |
|
|
| testuser | [data-testid='github-userName-input'] input |
|
|
| testuser@example.com | [data-testid='github-email-input'] input |
|
|
| test-token-12345 | [data-testid='github-token-input'] input |
|
|
When I click on a "save workspace button" element with selector "[data-testid='edit-workspace-save-button']"
|
|
Then I should not see a "save workspace button" element with selector "[data-testid='edit-workspace-save-button']"
|
|
When I switch to "main" window
|
|
|
|
# ══ Part A: Append conflict (different lines) → auto-merge ══
|
|
When I create file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" with content:
|
|
"""
|
|
created: 20250226090000000
|
|
modified: 20250226090000000
|
|
title: AppendDoc
|
|
tags: Shared
|
|
|
|
Line one from initial commit.
|
|
|
|
|
|
Line three placeholder.
|
|
"""
|
|
Then I wait for tiddler "AppendDoc" to be added by watch-fs
|
|
When I clear test-id markers from logs
|
|
When I click menu "知识库 > 立即同步云端"
|
|
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
|
|
|
# Simulated external push appends after line three - metadata stays same
|
|
When I push a commit to bare repository "{tmpDir}/remote-diverge.git" adding file "tiddlers/AppendDoc.tid" with content:
|
|
"""
|
|
created: 20250226090000000
|
|
modified: 20250226090000000
|
|
title: AppendDoc
|
|
tags: Shared
|
|
|
|
Line one from initial commit.
|
|
|
|
|
|
Line three placeholder.
|
|
Appended from external.
|
|
"""
|
|
|
|
# Desktop inserts text at the blank second line - metadata stays same
|
|
When I create file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" with content:
|
|
"""
|
|
created: 20250226090000000
|
|
modified: 20250226090000000
|
|
title: AppendDoc
|
|
tags: Shared
|
|
|
|
Line one from initial commit.
|
|
Inserted from desktop.
|
|
|
|
Line three placeholder.
|
|
"""
|
|
Then I wait for tiddler "AppendDoc" to be updated by watch-fs
|
|
|
|
# Desktop sync → git auto-merges non-overlapping changes
|
|
When I clear test-id markers from logs
|
|
When I click menu "知识库 > 立即同步云端"
|
|
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
|
Then file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" should contain text "Appended from external."
|
|
And file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" should contain text "Inserted from desktop."
|
|
And file "{tmpDir}/wiki/tiddlers/AppendDoc.tid" should not contain text "<<<<<<< HEAD"
|
|
|
|
# ══ Part B: Same-line edit conflict → conflict markers committed ══
|
|
When I create file "{tmpDir}/wiki/tiddlers/ConflictDoc.tid" with content:
|
|
"""
|
|
created: 20250226090000000
|
|
modified: 20250226090000000
|
|
title: ConflictDoc
|
|
tags: Conflict
|
|
|
|
Original line that will be edited.
|
|
"""
|
|
Then I wait for tiddler "ConflictDoc" to be added by watch-fs
|
|
When I clear test-id markers from logs
|
|
When I click menu "知识库 > 立即同步云端"
|
|
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
|
|
|
# External push edits the same line
|
|
When I push a commit to bare repository "{tmpDir}/remote-diverge.git" adding file "tiddlers/ConflictDoc.tid" with content:
|
|
"""
|
|
created: 20250226090000000
|
|
modified: 20250226110000000
|
|
title: ConflictDoc
|
|
tags: Conflict
|
|
|
|
External edited this line.
|
|
"""
|
|
|
|
# Desktop edits the same line locally
|
|
When I create file "{tmpDir}/wiki/tiddlers/ConflictDoc.tid" with content:
|
|
"""
|
|
created: 20250226090000000
|
|
modified: 20250226120000000
|
|
title: ConflictDoc
|
|
tags: Conflict
|
|
|
|
Desktop edited this line.
|
|
"""
|
|
Then I wait for tiddler "ConflictDoc" to be updated by watch-fs
|
|
|
|
# Desktop sync → rebase commits conflict markers (git-sync-js behavior)
|
|
When I clear test-id markers from logs
|
|
When I click menu "知识库 > 立即同步云端"
|
|
Then I wait for "git sync completed" log marker "[test-id-git-sync-complete]"
|
|
# For true same-line conflicts, git-sync-js commits conflict markers as-is
|
|
Then file "{tmpDir}/wiki/tiddlers/ConflictDoc.tid" should contain text "External edited this line."
|
|
And file "{tmpDir}/wiki/tiddlers/ConflictDoc.tid" should contain text "Desktop edited this line."
|